From 80657c818c3219ad15321bae975a6db7745b0f23 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Sat, 18 Apr 2015 12:06:50 +0200
Subject: [PATCH 1/3] Redirect to sign in page after signing out.

---
 CHANGELOG                                 | 1 +
 app/controllers/application_controller.rb | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index be96d712439..76ecf771b40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 7.11.0 (unreleased)
   -
 
 v 7.10.0 (unreleased)
+  - Redirect to sign in page after signing out.
   - Allow projects to be imported from Google Code.
   - Allow users to be invited by email to join a group or project.
   - Don't crash when project repository doesn't exist.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 920a981e7c9..5a63b496fab 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -87,6 +87,10 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def after_sign_out_path_for(resource)
+    new_user_session_path
+  end
+
   def abilities
     Ability.abilities
   end

From 78313410f906b290fc87dac7dcdff6952a1fc426 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Sat, 18 Apr 2015 23:04:14 +0200
Subject: [PATCH 2/3] Move changelog item to 7.11.

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 76ecf771b40..baa96732901 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 7.11.0 (unreleased)
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules
+  - Redirect to sign in page after signing out.
   -
   -
   -
@@ -12,7 +13,6 @@ v 7.11.0 (unreleased)
   -
 
 v 7.10.0 (unreleased)
-  - Redirect to sign in page after signing out.
   - Allow projects to be imported from Google Code.
   - Allow users to be invited by email to join a group or project.
   - Don't crash when project repository doesn't exist.

From 6c3591279f394a4f23eda42a7db09bc09cad8f10 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 20 Apr 2015 18:28:19 -0400
Subject: [PATCH 3/3] Fix two places where we should be using
 `Rails.env.development?`

---
 app/views/layouts/_head.html.haml      | 2 +-
 config/initializers/6_rack_profiler.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 78d6d08ee1f..5a6ae09a506 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -16,7 +16,7 @@
 
   = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
   = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')
-  = render 'layouts/bootlint' if Rails.env == 'development'
+  = render 'layouts/bootlint' if Rails.env.development?
 
   -# Atom feed
   - if current_user
diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb
index b6340287569..bdad6202b11 100644
--- a/config/initializers/6_rack_profiler.rb
+++ b/config/initializers/6_rack_profiler.rb
@@ -1,4 +1,4 @@
-if Rails.env == 'development'
+if Rails.env.development?
   require 'rack-mini-profiler'
 
   # initialization is skipped so trigger it