cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Merge 2.7.3 #8

Merged
chr merged 70 commits from upstream_v2.7.3 into cybrespace 2019-02-24 01:55:42 +01:00
Conversation 0 Commits 70 Files Changed 86 +6 -2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 98e38200ab - Show all commits

2
app/controllers/api/v1/apps/credentials_controller.rb
View File

@ -6,6 +6,6 @@ class Api::V1::Apps::CredentialsController < Api::BaseController
respond_to :json respond_to :json
def show 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
end end

6
app/serializers/rest/application_serializer.rb
View File

@ -2,7 +2,7 @@
class REST::ApplicationSerializer < ActiveModel::Serializer class REST::ApplicationSerializer < ActiveModel::Serializer
attributes :id, :name, :website, :redirect_uri, attributes :id, :name, :website, :redirect_uri,
:client_id, :client_secret :client_id, :client_secret, :vapid_key
def id def id
object.id.to_s object.id.to_s
@ -19,4 +19,8 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
def website def website
object.website.presence object.website.presence
end end
def vapid_key
Rails.configuration.x.vapid_public_key
end
end end