diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-04-23 15:14:22 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-04-23 15:14:22 +0200 |
| commit | cc8de0e5e7bd60f60e5bf0ae038b5f2711e9a409 (patch) | |
| tree | 5ca7e9c5d411344fa0eae35f826f3c6fe6dbbf79 | |
| parent | ac4968b97ea27311aa9dc26c7f017f4dbf54d8bb (diff) | |
| parent | d4fb062d97d0e9e2508a54eb7819fb2b6e05f345 (diff) | |
| download | gitlab-ce-cc8de0e5e7bd60f60e5bf0ae038b5f2711e9a409.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 | ||||
| -rw-r--r-- | config/initializers/6_rack_profiler.rb | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 69e575be23d..09601e27359 100644 --- a/CHANGELOG +++ b/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. diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8ddb424dcfb..cfe2c76265c 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 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 |