diff options
| author | Reverite <github@reverite.sh> | 2019-07-24 12:10:59 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-24 12:10:59 -0700 |
| commit | 2282fcc060109b41a540a7c46b8411c095488dcf (patch) | |
| tree | 72a35aa40b8de52481cfd7ecfbccef00e7d66d7a /app/controllers | |
| parent | fee3abd1dce8f437e3514cb03816ae50862b3c4c (diff) | |
| parent | 88e79c179a1a48feff3b16226c46f5885442651e (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/instances_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/manifests_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/well_known/keybase_proof_config_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb index b68c78615..93e4f0003 100644 --- a/app/controllers/api/v1/instances_controller.rb +++ b/app/controllers/api/v1/instances_controller.rb @@ -6,6 +6,6 @@ class Api::V1::InstancesController < Api::BaseController def show expires_in 3.minutes, public: true - render_with_cache json: {}, serializer: REST::InstanceSerializer + render_with_cache json: {}, serializer: REST::InstanceSerializer, root: 'instance' end end diff --git a/app/controllers/manifests_controller.rb b/app/controllers/manifests_controller.rb index 1e5db4393..491cde745 100644 --- a/app/controllers/manifests_controller.rb +++ b/app/controllers/manifests_controller.rb @@ -5,6 +5,6 @@ class ManifestsController < ApplicationController def show expires_in 3.minutes, public: true - render json: InstancePresenter.new, serializer: ManifestSerializer + render json: InstancePresenter.new, serializer: ManifestSerializer, root: 'instance' end end diff --git a/app/controllers/well_known/keybase_proof_config_controller.rb b/app/controllers/well_known/keybase_proof_config_controller.rb index c78683a8d..03232df2d 100644 --- a/app/controllers/well_known/keybase_proof_config_controller.rb +++ b/app/controllers/well_known/keybase_proof_config_controller.rb @@ -5,7 +5,7 @@ module WellKnown before_action :check_enabled def show - render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer + render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer, root: 'keybase_config' end private |