Download as
Browse Code »

Commit f963d374080c4a0db69cf9904199bcc5f6424b9f

Authored by Dmitriy Zaporozhets
2 parents 2985697a 236fd1e6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1592 from jouve/devise_layout 

make devise controllers use devise layout
Showing 3 changed files with 6 additions and 10 deletions   Show diff stats
app/views/layouts/devise.html.haml 0 → 100644
  Diff comments   View file @f963d37
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +!!! 5
  2 +%html{ lang: "en"}
  3 + = render "layouts/head"
  4 + %body.ui_basic.login-page
  5 + = render partial: "layouts/flash"
  6 + .container= yield
app/views/layouts/devise_layout.html.haml
View file @2985697
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
1 -!!! 5  
2 -%html{ lang: "en"}  
3 - = render "layouts/head"  
4 - %body.ui_basic.login-page  
5 - = render partial: "layouts/flash"  
6 - .container= yield  
config/application.rb
  Diff comments   View file @f963d37
@@ -53,9 +53,5 @@ module Gitlab @@ -53,9 +53,5 @@ module Gitlab
53 53
54 # Add fonts 54 # Add fonts
55 config.assets.paths << "#{Rails.root}/app/assets/fonts" 55 config.assets.paths << "#{Rails.root}/app/assets/fonts"
56 -  
57 - config.to_prepare do  
58 - Devise::SessionsController.layout 'devise_layout'  
59 - end  
60 end 56 end
61 end 57 end