Merge branch 'master' into glitch-soc/merge-upstream

2019-07-24 16:23:53 +02:00
parent e3a551cbd1 94f5c714f1
commit 2d35e4460a
11 changed files with 146 additions and 119 deletions
--- 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