diff --git a/CHANGELOG b/CHANGELOG index 4857682d0275b266818406e98c5a3c1336c42c40..c04b8f079af6b8f9f14eaaf5773c899cc41d8a92 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. diff --git a/Gemfile b/Gemfile index 0c1fff0bc147ca7617cc7d8c8b7f0c27efda1fbb..0d91de7e667fb2790bef7faf28ffb359d4f47a99 100644 --- a/Gemfile +++ b/Gemfile @@ -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 9d87de7d4e0cb34c71e07e17c044dd85d6b19e11..441fe69e8a427f84af3666ec5cdf2d2198207ffb 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)