diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-07-24 05:46:36 -0700 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-07-24 05:46:36 -0700 |
| commit | eca823c1c7cef45cc18c6ab36d2327650c85bfc3 (patch) | |
| tree | 50b6d6cce1d1da7f5a6e08b497b1b35718db30a9 /app/controllers/application_controller.rb | |
| parent | 024e0348904179a8dea81c01e27a5f014cf57499 (diff) | |
| parent | 8b7e404b5b6944e9c92cc270b2e5d0005781d49d (diff) | |
| download | gitlab-ce-eca823c1c7cef45cc18c6ab36d2327650c85bfc3.tar.gz | |
Merge branch 'master' into api
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9a0f95bf0cb..3265046d2ae 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -52,7 +52,7 @@ class ApplicationController < ActionController::Base def layout_by_resource if devise_controller? - "devise" + "devise_layout" else "application" end |