diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-23 17:21:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 17:21:55 +0200 |
| commit | 08325db62bcc4d5d530513c615bc1c733f166239 (patch) | |
| tree | 13cffcc0c8d6ed258928a89c1b328a055c54f2d3 /app/controllers/api/v1/instances_controller.rb | |
| parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
| parent | 48c68eafb73d2e697dab25ec55c235da4daf1cf8 (diff) | |
Merge pull request #1174 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/instances_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/instances_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb index 8c83a1801..b68c78615 100644 --- a/app/controllers/api/v1/instances_controller.rb +++ b/app/controllers/api/v1/instances_controller.rb @@ -5,8 +5,7 @@ class Api::V1::InstancesController < Api::BaseController skip_before_action :set_cache_headers def show - render_cached_json('api:v1:instances', expires_in: 5.minutes) do - ActiveModelSerializers::SerializableResource.new({}, serializer: REST::InstanceSerializer) - end + expires_in 3.minutes, public: true + render_with_cache json: {}, serializer: REST::InstanceSerializer end end |