diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-05 20:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 20:53:07 +0200 |
| commit | e4ca5414a37b7973247a283a364b27052c8f9d1c (patch) | |
| tree | dcb7769320c5a35b229ef579a20aa2fff209ea94 /app/controllers/api/v1/instances | |
| parent | 2c2f649200ba5b742ba9d17ac5ba553c752b59aa (diff) | |
| parent | eef8802325d75b2668b131a765c5555f4be8c2ce (diff) | |
Merge pull request #1032 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 | 1 | ||||
| -rw-r--r-- | app/controllers/api/v1/instances/peers_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb index e14e0aee8..09edfe365 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 diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb index 2070c487d..a8891d126 100644 --- a/app/controllers/api/v1/instances/peers_controller.rb +++ b/app/controllers/api/v1/instances/peers_controller.rb @@ -2,6 +2,7 @@ class Api::V1::Instances::PeersController < Api::BaseController before_action :require_enabled_api! + skip_before_action :set_cache_headers respond_to :json |