diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-30 11:10:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-30 11:10:46 +0200 |
commit | 24552b5160a5090e7d6056fb69a209aa48fe4fce (patch) | |
tree | 57ab47f71d7f589c9da4dd959d3dec6f0902409a /app/controllers/api/v1/instances/activity_controller.rb | |
parent | 85b7b565def2594b6ad791731802eb4c8a803a69 (diff) |
Add whitelist mode (#11291)
Diffstat (limited to 'app/controllers/api/v1/instances/activity_controller.rb')
-rw-r--r-- | app/controllers/api/v1/instances/activity_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb index d0080c5c2..4fb5a69d8 100644 --- a/app/controllers/api/v1/instances/activity_controller.rb +++ b/app/controllers/api/v1/instances/activity_controller.rb @@ -2,6 +2,7 @@ class Api::V1::Instances::ActivityController < Api::BaseController before_action :require_enabled_api! + skip_before_action :set_cache_headers respond_to :json @@ -33,6 +34,6 @@ class Api::V1::Instances::ActivityController < Api::BaseController end def require_enabled_api! - head 404 unless Setting.activity_api_enabled + head 404 unless Setting.activity_api_enabled && !whitelist_mode? end end |