diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 16:31:33 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 16:31:33 +0000 |
| commit | c70c3bad8aeb49f349d71c0f91570264350420a7 (patch) | |
| tree | fa6dbfcdb6ec1339c5fc33d762bebeb3d44e9051 /app/controllers/admin | |
| parent | cf879c93345b05e8cbe01ccad3bfdc008e988cf8 (diff) | |
| parent | 608271626d44c950fffc96ab54ecdaf60bc5f490 (diff) | |
| download | gitlab-ce-c70c3bad8aeb49f349d71c0f91570264350420a7.tar.gz | |
Merge branch 'dz-fix-appearance-preview' into 'master'
Fix admin appearance settings preview
Render appearance settings preview in devise layout instead of implementing it 2 times.
See merge request !4792
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/appearances_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/appearances_controller.rb b/app/controllers/admin/appearances_controller.rb index 26cf74e4849..4b0ec54b3f4 100644 --- a/app/controllers/admin/appearances_controller.rb +++ b/app/controllers/admin/appearances_controller.rb @@ -5,6 +5,7 @@ class Admin::AppearancesController < Admin::ApplicationController end def preview + render 'preview', layout: 'devise' end def create |