Merge branch 'update-browser-gem' into 'master'

Update browser gem to 2.2.0 A user with a certain browser would hit an Error 500: ``` ArgumentError: invalid value for Float(): "0." from browser/accept_language.rb:45:in `Float' from browser/accept_language.rb:45:in `quality' from browser/accept_language.rb:15:in `each' from browser/accept_language.rb:15:in `sort_by' from browser/accept_language.rb:15:in `parse' from browser/base.rb:13:in `initialize' from browser.rb:125:in `new' from browser.rb:125:in `block in new' from browser.rb:125:in `map' from browser.rb:125:in `new' from browser/action_controller.rb:15:in `browser' from abstract_controller/helpers.rb:67:in `browser' from app/views/layouts/_head.html.haml:38:in `_app_views_layouts__head_html_haml__1626593241142487258_59224880' ``` The root cause when the `Accept-Language` header would contain a float for the quality value (e.g. en-GB,en;q=0.v5). Fixes https://github.com/fnando/browser/issues/241 Seen today via Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/7644/ See merge request !4811

Merge branch 'update-browser-gem' into 'master'
2527ae6c · Robert Speicher · 63d411d7 · 2302b2c1 · 2527ae6c · 2527ae6c
Commit 2527ae6c authored Jun 21, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ gem 'attr_encrypted', '~> 3.0.0'
 gem 'u2f', '~> 0.2.1'

 # Browser detection
-gem "browser", '~> 2.0.3'
+gem "browser", '~> 2.2'

 # Extracting information from a git repository
 # Provide access to Gitlab::Git library

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,7 +98,7 @@ GEM
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
    brakeman (3.3.2)
-    browser (2.0.3)
+    browser (2.2.0)
    builder (3.2.2)
    bullet (5.0.0)
      activesupport (>= 3.0.0)
@@ -833,7 +833,7 @@ DEPENDENCIES
  binding_of_caller (~> 0.7.2)
  bootstrap-sass (~> 3.3.0)
  brakeman (~> 3.3.0)
-  browser (~> 2.0.3)
+  browser (~> 2.2)
  bullet
  bundler-audit
  byebug