Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG app/assets/stylesheets/generic/common.scss
This commit is contained in:
commit
3d3c7e743f
10
CHANGELOG
10
CHANGELOG
|
@ -14,8 +14,12 @@ v 7.7.0
|
|||
-
|
||||
-
|
||||
- New side navigation
|
||||
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
- Add alert message in case of outdated browser (IE < 10)
|
||||
-
|
||||
-
|
||||
|
||||
v 7.6.0
|
||||
- Fork repository to groups
|
||||
|
@ -62,7 +66,7 @@ v 7.5.0
|
|||
- Performance improvements
|
||||
- Fix post-receive issue for projects with deleted forks
|
||||
- New gitlab-shell version with custom hooks support
|
||||
- Improve code
|
||||
- Improve code
|
||||
- GitLab CI 5.2+ support (does not support older versions)
|
||||
- Fixed bug when you can not push commits starting with 000000 to protected branches
|
||||
- Added a password strength indicator
|
||||
|
|
3
Gemfile
3
Gemfile
|
@ -32,6 +32,9 @@ gem 'omniauth-kerberos'
|
|||
gem 'doorkeeper', '2.0.1'
|
||||
gem "rack-oauth2", "~> 1.0.5"
|
||||
|
||||
# Browser detection
|
||||
gem "browser"
|
||||
|
||||
# Extracting information from a git repository
|
||||
# Provide access to Gitlab::Git library
|
||||
gem "gitlab_git", '7.0.0.rc12'
|
||||
|
|
|
@ -50,6 +50,7 @@ GEM
|
|||
debug_inspector (>= 0.0.1)
|
||||
bootstrap-sass (3.0.3.0)
|
||||
sass (~> 3.2)
|
||||
browser (0.7.2)
|
||||
builder (3.2.2)
|
||||
capybara (2.2.1)
|
||||
mime-types (>= 1.16)
|
||||
|
@ -614,6 +615,7 @@ DEPENDENCIES
|
|||
better_errors
|
||||
binding_of_caller
|
||||
bootstrap-sass (~> 3.0)
|
||||
browser
|
||||
capybara (~> 2.2.1)
|
||||
carrierwave
|
||||
coffee-rails
|
||||
|
|
|
@ -207,6 +207,18 @@ li.note {
|
|||
}
|
||||
}
|
||||
|
||||
.browser-alert {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
background: #C67;
|
||||
color: #fff;
|
||||
font-weight: bold;
|
||||
a {
|
||||
color: #fff;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
|
||||
.warning_message {
|
||||
border-left: 4px solid #ed9;
|
||||
color: #b90;
|
||||
|
|
|
@ -293,4 +293,8 @@ module ApplicationHelper
|
|||
path << "?#{options.to_param}"
|
||||
path
|
||||
end
|
||||
|
||||
def outdated_browser?
|
||||
browser.ie? && browser.version.to_i < 10
|
||||
end
|
||||
end
|
||||
|
|
|
@ -44,3 +44,5 @@
|
|||
%li.hidden-xs
|
||||
= link_to current_user, class: "profile-pic", id: 'profile-pic' do
|
||||
= image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
|
||||
|
||||
= render 'shared/outdated_browser'
|
||||
|
|
|
@ -20,3 +20,4 @@
|
|||
%li.visible-xs
|
||||
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
|
||||
|
||||
= render 'shared/outdated_browser'
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
.content
|
||||
.login-title
|
||||
%h1= brand_title
|
||||
= render 'shared/outdated_browser'
|
||||
%hr
|
||||
.container
|
||||
.content
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
- if outdated_browser?
|
||||
- link = "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/requirements.md#supported-web-browsers"
|
||||
.browser-alert
|
||||
GitLab may not work properly because you are using an outdated web browser.
|
||||
%br
|
||||
Please install a
|
||||
= link_to 'supported web browser', link
|
||||
for a better experience.
|
Loading…
Reference in New Issue