diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-23 16:52:29 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-23 16:52:29 -0700 |
| commit | 6318a7631131074d5d65775f92097b9c1e3f04d6 (patch) | |
| tree | 8d6221636444275b5f9bc49994d3d751c34fd78d | |
| parent | 24b282aeeaf5ba41c6b73100051eb48428787770 (diff) | |
| download | gitlab-ce-6318a7631131074d5d65775f92097b9c1e3f04d6.tar.gz | |
Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode
Closes #2271
| -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 7eb6ab81dd9..99df3c7a838 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) |