tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
This commit is contained in:
Thibaut Girka
2019-12-12 15:40:06 +01:00
parent 246addd5b3 d08a497946
commit be4849c083
10 changed files with 281 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/applications/_fields.html.haml
View File

@ -7,7 +7,7 @@
.fields-group
= f.input :redirect_uri, wrapper: :with_block_label, label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri')
%p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: Doorkeeper.configuration.native_redirect_uri)
%p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, Doorkeeper.configuration.native_redirect_uri)).html_safe
.field-group
.input.with_block_label