Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Coda Zabetta <francesco.codazabetta@gmail.com>2014-12-15 13:11:38 +0300
committerFrancesco Coda Zabetta <francesco.codazabetta@gmail.com>2014-12-24 18:22:08 +0300
commit84b40a346a46ca75e7a8981999c6b74187328435 (patch)
tree67caa9f8f17ee1eb925f851c58290826c3ea8060
parentfe104386b16a73cbac1588aa5cce8319c6355ee9 (diff)
check browser version, blacklisting outdated IE (version < 10)
-rw-r--r--CHANGELOG5
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock2
-rw-r--r--app/assets/stylesheets/generic/common.scss12
-rw-r--r--app/helpers/application_helper.rb4
-rw-r--r--app/views/layouts/_head_panel.html.haml2
-rw-r--r--app/views/layouts/_public_head_panel.html.haml1
-rw-r--r--app/views/layouts/devise.html.haml1
-rw-r--r--app/views/shared/_outdated_browser.html.haml8
9 files changed, 36 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4b78d1218ca..80399bc0d41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,8 +13,9 @@ v 7.7.0
-
-
-
+ - Add alert message in case of outdated browser (IE < 10)
+ -
-
-
v 7.6.0
@@ -62,7 +63,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
diff --git a/Gemfile b/Gemfile
index ce9b83308f3..99f14a174c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,6 +30,9 @@ gem 'omniauth-github'
gem 'omniauth-shibboleth'
gem 'omniauth-kerberos'
+# Browser detection
+gem "browser"
+
# Extracting information from a git repository
# Provide access to Gitlab::Git library
gem "gitlab_git", '7.0.0.rc12'
diff --git a/Gemfile.lock b/Gemfile.lock
index cf96677f875..84156a73d19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,6 +49,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)
@@ -604,6 +605,7 @@ DEPENDENCIES
better_errors
binding_of_caller
bootstrap-sass (~> 3.0)
+ browser
capybara (~> 2.2.1)
carrierwave
coffee-rails
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 2fc738c18d8..f3879defb77 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -227,6 +227,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;
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 90cc58f44b7..54caaa0f7e5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -293,4 +293,8 @@ module ApplicationHelper
path << "?#{options.to_param}"
path
end
+
+ def outdated_browser?
+ browser.ie? && browser.version.to_i < 10
+ end
end
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index eda37f8237a..e98b8ec631d 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -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'
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 9bfc14d16c1..02a5e4868d1 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -20,3 +20,4 @@
%li.visible-xs
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
+= render 'shared/outdated_browser'
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 06de03eadad..6539a24119c 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -6,6 +6,7 @@
.content
.login-title
%h1= brand_title
+ = render 'shared/outdated_browser'
%hr
.container
.content
diff --git a/app/views/shared/_outdated_browser.html.haml b/app/views/shared/_outdated_browser.html.haml
new file mode 100644
index 00000000000..0eba1fe075f
--- /dev/null
+++ b/app/views/shared/_outdated_browser.html.haml
@@ -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.