From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 24 Jul 2019 14:23:53 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2d35e4460a6c55930568d4b19563f9894d89e79b;p=mastodon.git

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

2d35e4460a6c55930568d4b19563f9894d89e79b
diff --cc app/controllers/well_known/keybase_proof_config_controller.rb
index c78683a8d,e1d43ecbe..03232df2d
--- a/app/controllers/well_known/keybase_proof_config_controller.rb
+++ b/app/controllers/well_known/keybase_proof_config_controller.rb
@@@ -2,16 -2,8 +2,16 @@@
  
  module WellKnown
    class KeybaseProofConfigController < ActionController::Base
 +    before_action :check_enabled
 +
      def show
-       render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer
+       render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer, root: 'keybase_config'
      end
 +
 +    private
 +
 +    def check_enabled
 +      head 404 unless Setting.enable_keybase
 +    end
    end
  end