Merge tag 'v2.7.2' into instance_only_statuses

2019-02-19 21:07:43 +01:00
parent e8012c10be f3eb99aec3
commit 153385e508
76 changed files with 1440 additions and 577 deletions
--- a/app/controllers/api/v1/apps/credentials_controller.rb
+++ b/app/controllers/api/v1/apps/credentials_controller.rb
@ -6,6 +6,6 @@ class Api::V1::Apps::CredentialsController < Api::BaseController
  respond_to :json

  def show
-    render json: doorkeeper_token.application, serializer: REST::StatusSerializer::ApplicationSerializer
+    render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key)
  end
 end