diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-08 22:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 22:09:53 +0100 |
| commit | 840b17e3444f9a68d3639f1ffeb326e8cb1e03b1 (patch) | |
| tree | 8254538ed33f4c4b974b5379f3b5a0b489ba095a /app/controllers/api/v1/instances | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 9c2922958783f7e499cdda5bb874d6096e47eb0a (diff) | |
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/instances')
| -rw-r--r-- | app/controllers/api/v1/instances/activity_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/instances/peers_controller.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb index b30e8464c..4f6b4bcbf 100644 --- a/app/controllers/api/v1/instances/activity_controller.rb +++ b/app/controllers/api/v1/instances/activity_controller.rb @@ -6,8 +6,6 @@ class Api::V1::Instances::ActivityController < Api::BaseController skip_before_action :set_cache_headers skip_before_action :require_authenticated_user!, unless: :whitelist_mode? - respond_to :json - def show expires_in 1.day, public: true render_with_cache json: :activity, expires_in: 1.day diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb index cc00d8a6b..9fa440935 100644 --- a/app/controllers/api/v1/instances/peers_controller.rb +++ b/app/controllers/api/v1/instances/peers_controller.rb @@ -6,8 +6,6 @@ class Api::V1::Instances::PeersController < Api::BaseController skip_before_action :set_cache_headers skip_before_action :require_authenticated_user!, unless: :whitelist_mode? - respond_to :json - def index expires_in 1.day, public: true render_with_cache(expires_in: 1.day) { Account.remote.domains } |