diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
commit | 7a1ca8b0df9d82a1e6ac4943a2d5562f93eab69f (patch) | |
tree | 36fbf6f3d2019cc345d33fe555569ec750a66957 /config/application.rb | |
parent | b8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (diff) | |
parent | a3e53bd442752f210db2025f2dfc45e7599354c2 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index ed5fdb7f7..eb89f0a10 100644 --- a/config/application.rb +++ b/config/application.rb @@ -86,7 +86,7 @@ module Mastodon config.middleware.use Rack::Deflater config.to_prepare do - Doorkeeper::AuthorizationsController.layout 'public' + Doorkeeper::AuthorizationsController.layout 'modal' Doorkeeper::AuthorizedApplicationsController.layout 'admin' Doorkeeper::Application.send :include, ApplicationExtension end |