diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-25 08:05:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-25 08:05:30 +0000 |
| commit | c06cf2bde6fcb08f476d6cf9180c545b757ce829 (patch) | |
| tree | 2eb4532a96b5664cfbc2ab0c3534da3e14113ec8 | |
| parent | c52fe24c3694463c828c5efa0a38510cb8229a36 (diff) | |
| parent | 6318a7631131074d5d65775f92097b9c1e3f04d6 (diff) | |
| download | gitlab-ce-c06cf2bde6fcb08f476d6cf9180c545b757ce829.tar.gz | |
Merge branch 'upgrade-browser-gem' into 'master'
Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode
GitLab currently displays the "outdated browser" message if users run Internet Explorer 11 in Compatibility Mode. @fnando [updated the browser gem](https://github.com/fnando/browser/pull/168) to use IE's Trident version to determine the "true" version of IE11.
Closes #2271
See merge request !1188
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5940d586d88..9fddcf82783 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.0.0 (unreleased) + - Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode (Stan Hu) - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu) - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu) - Remove satellites @@ -34,7 +34,7 @@ gem 'rqrcode-rails3' gem 'attr_encrypted', '1.3.4' # Browser detection -gem "browser", '~> 0.8.0' +gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library diff --git a/Gemfile.lock b/Gemfile.lock index 5278fe243a8..a7cfe6b7511 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM ruby_parser (~> 3.5.0) sass (~> 3.0) terminal-table (~> 1.4) - browser (0.8.0) + browser (1.0.0) builder (3.2.2) byebug (3.2.0) columnize (~> 0.8) @@ -755,7 +755,7 @@ DEPENDENCIES binding_of_caller bootstrap-sass (~> 3.0) brakeman - browser (~> 0.8.0) + browser (~> 1.0.0) byebug cal-heatmap-rails (~> 0.0.1) capybara (~> 2.4.0) |