diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
| commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
| tree | 88a1715021c33add55501351dbf74950deeac481 /config/application.rb | |
| parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
| parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) | |
Merge pull request #1 from Gargron/master
Catchup merge
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 091f9c535..79ace8521 100644 --- a/config/application.rb +++ b/config/application.rb @@ -45,7 +45,7 @@ module Mastodon config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"' config.to_prepare do - Doorkeeper::AuthorizationsController.layout 'auth' + Doorkeeper::AuthorizationsController.layout 'public' end config.action_dispatch.default_headers = { |