Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
cc8de0e5e7
|
@ -4,6 +4,7 @@ v 7.11.0 (unreleased)
|
||||||
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
|
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
|
||||||
- Ignore invalid lines in .gitmodules
|
- Ignore invalid lines in .gitmodules
|
||||||
- Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu)
|
- 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`)
|
- 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.
|
- Fix bug causing `@whatever` inside an issue's first code block to be picked up as a user mention.
|
||||||
|
|
|
@ -87,6 +87,10 @@ class ApplicationController < ActionController::Base
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def after_sign_out_path_for(resource)
|
||||||
|
new_user_session_path
|
||||||
|
end
|
||||||
|
|
||||||
def abilities
|
def abilities
|
||||||
Ability.abilities
|
Ability.abilities
|
||||||
end
|
end
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
= render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
|
= 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/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
|
-# Atom feed
|
||||||
- if current_user
|
- if current_user
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if Rails.env == 'development'
|
if Rails.env.development?
|
||||||
require 'rack-mini-profiler'
|
require 'rack-mini-profiler'
|
||||||
|
|
||||||
# initialization is skipped so trigger it
|
# initialization is skipped so trigger it
|
||||||
|
|
Loading…
Reference in New Issue