summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-06-10 05:45:31 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2015-06-10 05:45:31 +0000
commit671398e7392c86cf3cbf76037abbc39a40ec5b6d (patch)
treeb41e5a5b2ffd861a0b263307de0578d50f31f857 /Gemfile.lock
parent269c2d2efc912ebc602426f7813d117297ff43d9 (diff)
parentbbb4aa5317a75e5f89b6967a923dfdccfb29b037 (diff)
downloadgitlab-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
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
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)