Adding config for puma, dashboard layout, fixing some queries

2016-03-12 16:09:46 +01:00
parent 447cfef62d
commit aab9f57e36
25 changed files with 264 additions and 134 deletions
--- 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