Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -4,6 +4,7 @@ v 7.11.0 (unreleased)
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules
   - Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu)
+  - Redirect to sign in page after signing out.
   -
   - Add "Reply quoting selected text" shortcut key (`r`)
   - Fix bug causing `@whatever` inside an issue's first code block to be picked up as a user mention.

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

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

config/initializers/6_rack_profiler.rb

-if Rails.env == 'development'
+if Rails.env.development?
   require 'rack-mini-profiler'
   # initialization is skipped so trigger it