about summary refs log tree commit diff
path: root/config/application.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-12 16:09:46 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-12 16:21:53 +0100
commitaab9f57e369c492bad03bcf15411394897314b4d (patch)
treeae8cf704e2b2321993cabf326af82ae0f86b6697 /config/application.rb
parent447cfef62d74a670ddd600c0240f41746ac2fe0a (diff)
Adding config for puma, dashboard layout, fixing some queries
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb
index 3f23b0a94..e7634854a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,8 +29,9 @@ module Mastodon
     config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
 
     config.to_prepare do
-      Doorkeeper::AuthorizationsController.layout 'auth'
-      Doorkeeper::AuthorizedApplicationsController.layout 'auth'
+      Doorkeeper::ApplicationsController.layout           'dashboard'
+      Doorkeeper::AuthorizedApplicationsController.layout 'dashboard'
+      Doorkeeper::AuthorizationsController.layout         'auth'
     end
   end
 end