7 files changed, 12 insertions, 30 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9ea11daf2bb..a299a83b96e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,19 +11,17 @@ class ApplicationController < ActionController::Base
   helper_method :abilities, :can?
 
   rescue_from Gitlab::Gitolite::AccessDenied do |exception|
-    render "errors/gitolite", layout: "error", status: 500
+    render "errors/gitolite", layout: "errors", status: 500
   end
 
   rescue_from Encoding::CompatibilityError do |exception|
-    render "errors/encoding", layout: "error", status: 500
+    render "errors/encoding", layout: "errors", status: 500
   end
 
   rescue_from ActiveRecord::RecordNotFound do |exception|
-    render "errors/not_found", layout: "error", status: 404
+    render "errors/not_found", layout: "errors", status: 404
   end
 
-  layout :layout_by_resource
-
   protected
 
   def check_token_auth
@@ -51,14 +49,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def layout_by_resource
-    if devise_controller?
-      "devise_layout"
-    else
-      "application"
-    end
-  end
-
   def set_current_user_for_mailer
     MailerObserver.current_user = current_user
   end
@@ -93,15 +83,15 @@ class ApplicationController < ActionController::Base
   end
 
   def access_denied!
-    render "errors/access_denied", layout: "error", status: 404
+    render "errors/access_denied", layout: "errors", status: 404
   end
 
   def not_found!
-    render "errors/not_found", layout: "error", status: 404
+    render "errors/not_found", layout: "errors", status: 404
   end
 
   def git_not_found!
-    render "errors/git_not_found", layout: "error", status: 404
+    render "errors/git_not_found", layout: "errors", status: 404
   end
 
   def method_missing(method_sym, *arguments, &block)
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index 9f60c64590e..e998d72365c 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,6 +1,4 @@
 class ErrorsController < ApplicationController
-  layout "error"
-
   def githost
     render "errors/gitolite"
   end
diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb
index 7ddbfe1128d..2b8e18f6286 100644
--- a/app/controllers/profile_controller.rb
+++ b/app/controllers/profile_controller.rb
@@ -1,5 +1,4 @@
 class ProfileController < ApplicationController
-  layout "profile"
   before_filter :user
 
   def show
diff --git a/app/controllers/project_controller.rb b/app/controllers/project_controller.rb
index 84c81ce2a17..de4f317a7bd 100644
--- a/app/controllers/project_controller.rb
+++ b/app/controllers/project_controller.rb
@@ -2,15 +2,4 @@ class ProjectController < ApplicationController
   before_filter :project
   # Authorize
   before_filter :add_project_abilities
-
-  layout :determine_layout
-
-  protected
-  def determine_layout
-    if @project && !@project.new_record?
-      'project'
-    else
-      'application'
-    end
-  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2a11611e84b..81c267a8ede 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,6 +8,8 @@ class ProjectsController < ProjectController
   before_filter :authorize_admin_project!, only: [:edit, :update, :destroy]
   before_filter :require_non_empty_project, only: [:blob, :tree, :graph]
 
+  layout 'application', only: [:new, :create]
+
   def new
     @project = Project.new
   end
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/errors.html.haml
index 1f5c03bdced..1f5c03bdced 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/errors.html.haml
diff --git a/config/application.rb b/config/application.rb
index 27de3fa2436..fd0dd019ca1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -53,5 +53,9 @@ module Gitlab
 
     # Add fonts
     config.assets.paths << "#{Rails.root}/app/assets/fonts"
+
+    config.to_prepare do
+      Devise::SessionsController.layout 'devise_layout'
+    end
   end
 end