diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-05 19:56:50 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-05 19:56:50 +0100 |
| commit | 2d9670b5252ea415fd1d9f61a0016fc219e2c21e (patch) | |
| tree | 38906c78f34a1716a150a8f627eecf122b7c0c7b /app/controllers | |
| parent | fc4f3164a6ba8e5ae1bb0792ea7f1ebb4753ccb4 (diff) | |
| parent | 8c77ae2d9eb40d8039f3b142d462f4705a0bf53e (diff) | |
| download | gitlab-ce-2d9670b5252ea415fd1d9f61a0016fc219e2c21e.tar.gz | |
Merge remote-tracking branch 'origin/master' into list-multiple-clusters
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/appearances_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/appearances_controller.rb b/app/controllers/admin/appearances_controller.rb index 92df1c8dff0..dd0b38970bd 100644 --- a/app/controllers/admin/appearances_controller.rb +++ b/app/controllers/admin/appearances_controller.rb @@ -4,8 +4,8 @@ class Admin::AppearancesController < Admin::ApplicationController def show end - def preview - render 'preview', layout: 'devise' + def preview_sign_in + render 'preview_sign_in', layout: 'devise' end def create @@ -52,7 +52,7 @@ class Admin::AppearancesController < Admin::ApplicationController def appearance_params params.require(:appearance).permit( :title, :description, :logo, :logo_cache, :header_logo, :header_logo_cache, - :updated_by + :new_project_guidelines, :updated_by ) end end |