Merge pull request #1592 from jouve/devise_layout

make devise controllers use devise layout

Merge pull request #1592 from jouve/devise_layout
make devise controllers use devise layout
Dmitriy Zaporozhets
2 parents 2985697a 236fd1e6
Showing 3 changed files with 6 additions and 10 deletions Show diff stats
app/views/layouts/devise.html.haml
app/views/layouts/devise_layout.html.haml
config/application.rb
@@ -0,0 +1,6 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head"
+  %body.ui_basic.login-page
+    = render partial: "layouts/flash"
+    .container= yield
@@ -1,6 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head"
-  %body.ui_basic.login-page
-    = render partial: "layouts/flash"
-    .container= yield
@@ -53,9 +53,5 @@ module Gitlab
  
     # Add fonts
     config.assets.paths << "#{Rails.root}/app/assets/fonts"
-
-    config.to_prepare do
-      Devise::SessionsController.layout 'devise_layout'
-    end
   end
 end
...	...	@@ -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
...	...
...	...	@@ -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
...	...	@@ -53,9 +53,5 @@ module Gitlab
53	53
54	54	# Add fonts
55	55	config.assets.paths << "#{Rails.root}/app/assets/fonts"
56		-
57		- config.to_prepare do
58		- Devise::SessionsController.layout 'devise_layout'
59		- end
60	56	end
61	57	end
...	...