diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-06-10 05:45:31 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-06-10 05:45:31 +0000 |
| commit | 671398e7392c86cf3cbf76037abbc39a40ec5b6d (patch) | |
| tree | b41e5a5b2ffd861a0b263307de0578d50f31f857 | |
| parent | 269c2d2efc912ebc602426f7813d117297ff43d9 (diff) | |
| parent | bbb4aa5317a75e5f89b6967a923dfdccfb29b037 (diff) | |
| download | gitlab-ce-671398e7392c86cf3cbf76037abbc39a40ec5b6d.tar.gz | |
Merge branch 'bump-browser-gem-version-for-ie11' into 'master'
Update browser gem to version 0.8.0
Internet Explorer 11.0.9600.17633 has a new User-Agent string (tested using [BrowserStack](https://www.browserstack.com)):
```
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko
```
This is supported in v0.8.0 of the browser gem:
https://github.com/fnando/browser/commit/aab7a81d94cc2c31c4b860fa4a9b9a361adf1bab
Closes #1775
See merge request !791
| -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 4857682d027..c04b8f079af 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 7.12.0 (unreleased) + - Update browser gem to version 0.8.0 for IE11 support (Stan Hu) - Fix timeout when rendering file with thousands of lines. - Add "Remember me" checkbox to LDAP signin form. - Don't notify users mentioned in code blocks or blockquotes. @@ -30,7 +30,7 @@ gem 'rqrcode-rails3' gem 'attr_encrypted', '1.3.4' # Browser detection -gem "browser" +gem "browser", '~> 0.8.0' # Extracting information from a git repository # Provide access to Gitlab::Git library diff --git a/Gemfile.lock b/Gemfile.lock index 9d87de7d4e0..441fe69e8a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,7 @@ GEM ruby_parser (~> 3.5.0) sass (~> 3.0) terminal-table (~> 1.4) - browser (0.7.2) + browser (0.8.0) builder (3.2.2) byebug (3.2.0) columnize (~> 0.8) @@ -680,7 +680,7 @@ DEPENDENCIES binding_of_caller bootstrap-sass (~> 3.0) brakeman - browser + browser (~> 0.8.0) byebug cal-heatmap-rails (~> 0.0.1) capybara (~> 2.2.1) |