Commit e35e7584 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'pravi/gitlab-update-rubygem-browser' into 'master'

Update browser rubygem 2.5 to 4.2

See merge request gitlab-org/gitlab!37349
parents 1d5ff409 bf53d8ef
...@@ -69,7 +69,7 @@ gem 'rubyzip', '~> 2.0.0', require: 'zip' ...@@ -69,7 +69,7 @@ gem 'rubyzip', '~> 2.0.0', require: 'zip'
gem 'acme-client', '~> 2.0', '>= 2.0.6' gem 'acme-client', '~> 2.0', '>= 2.0.6'
# Browser detection # Browser detection
gem 'browser', '~> 2.5' gem 'browser', '~> 4.2'
# GPG # GPG
gem 'gpgme', '~> 2.0.19' gem 'gpgme', '~> 2.0.19'
......
...@@ -125,7 +125,7 @@ GEM ...@@ -125,7 +125,7 @@ GEM
actionpack (>= 5.0) actionpack (>= 5.0)
activemodel (>= 5.0) activemodel (>= 5.0)
brakeman (4.2.1) brakeman (4.2.1)
browser (2.5.3) browser (4.2.0)
builder (3.2.4) builder (3.2.4)
bullet (6.0.2) bullet (6.0.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
...@@ -1195,7 +1195,7 @@ DEPENDENCIES ...@@ -1195,7 +1195,7 @@ DEPENDENCIES
bootsnap (~> 1.4.6) bootsnap (~> 1.4.6)
bootstrap_form (~> 4.2.0) bootstrap_form (~> 4.2.0)
brakeman (~> 4.2) brakeman (~> 4.2)
browser (~> 2.5) browser (~> 4.2)
bullet (~> 6.0.2) bullet (~> 6.0.2)
bundler-audit (~> 0.6.1) bundler-audit (~> 0.6.1)
capybara (~> 3.22.0) capybara (~> 3.22.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment