Commit 3d3c7e74 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq...

Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
parents 25a42a56 84b40a34
...@@ -14,8 +14,12 @@ v 7.7.0 ...@@ -14,8 +14,12 @@ v 7.7.0
- -
- -
- New side navigation - New side navigation
-
-
-
- Add alert message in case of outdated browser (IE < 10)
-
-
v 7.6.0 v 7.6.0
- Fork repository to groups - Fork repository to groups
......
...@@ -32,6 +32,9 @@ gem 'omniauth-kerberos' ...@@ -32,6 +32,9 @@ gem 'omniauth-kerberos'
gem 'doorkeeper', '2.0.1' gem 'doorkeeper', '2.0.1'
gem "rack-oauth2", "~> 1.0.5" gem "rack-oauth2", "~> 1.0.5"
# Browser detection
gem "browser"
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # Provide access to Gitlab::Git library
gem "gitlab_git", '7.0.0.rc12' gem "gitlab_git", '7.0.0.rc12'
......
...@@ -50,6 +50,7 @@ GEM ...@@ -50,6 +50,7 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootstrap-sass (3.0.3.0) bootstrap-sass (3.0.3.0)
sass (~> 3.2) sass (~> 3.2)
browser (0.7.2)
builder (3.2.2) builder (3.2.2)
capybara (2.2.1) capybara (2.2.1)
mime-types (>= 1.16) mime-types (>= 1.16)
...@@ -614,6 +615,7 @@ DEPENDENCIES ...@@ -614,6 +615,7 @@ DEPENDENCIES
better_errors better_errors
binding_of_caller binding_of_caller
bootstrap-sass (~> 3.0) bootstrap-sass (~> 3.0)
browser
capybara (~> 2.2.1) capybara (~> 2.2.1)
carrierwave carrierwave
coffee-rails coffee-rails
......
...@@ -207,6 +207,18 @@ li.note { ...@@ -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 { .warning_message {
border-left: 4px solid #ed9; border-left: 4px solid #ed9;
color: #b90; color: #b90;
......
...@@ -293,4 +293,8 @@ module ApplicationHelper ...@@ -293,4 +293,8 @@ module ApplicationHelper
path << "?#{options.to_param}" path << "?#{options.to_param}"
path path
end end
def outdated_browser?
browser.ie? && browser.version.to_i < 10
end
end end
...@@ -44,3 +44,5 @@ ...@@ -44,3 +44,5 @@
%li.hidden-xs %li.hidden-xs
= link_to current_user, class: "profile-pic", id: 'profile-pic' do = link_to current_user, class: "profile-pic", id: 'profile-pic' do
= image_tag avatar_icon(current_user.email, 26), alt: 'User activity' = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
= render 'shared/outdated_browser'
...@@ -20,3 +20,4 @@ ...@@ -20,3 +20,4 @@
%li.visible-xs %li.visible-xs
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes') = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
= render 'shared/outdated_browser'
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.content .content
.login-title .login-title
%h1= brand_title %h1= brand_title
= render 'shared/outdated_browser'
%hr %hr
.container .container
.content .content
......
- 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.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment