Commit aa02b081 authored by Mark Chao's avatar Mark Chao

Merge branch 'sh-update-bullet-gem' into 'master'

Update to Bullet v6.1.0 for Ruby 2.7

See merge request gitlab-org/gitlab!40050
parents 5a4db706 46ef4cd6
...@@ -350,7 +350,7 @@ group :development do ...@@ -350,7 +350,7 @@ group :development do
end end
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.0.2' gem 'bullet', '~> 6.1.0'
gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
......
...@@ -145,7 +145,7 @@ GEM ...@@ -145,7 +145,7 @@ GEM
brakeman (4.2.1) brakeman (4.2.1)
browser (4.2.0) browser (4.2.0)
builder (3.2.4) builder (3.2.4)
bullet (6.0.2) bullet (6.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
bundler-audit (0.6.1) bundler-audit (0.6.1)
...@@ -1245,7 +1245,7 @@ DEPENDENCIES ...@@ -1245,7 +1245,7 @@ DEPENDENCIES
bootstrap_form (~> 4.2.0) bootstrap_form (~> 4.2.0)
brakeman (~> 4.2) brakeman (~> 4.2)
browser (~> 4.2) browser (~> 4.2)
bullet (~> 6.0.2) bullet (~> 6.1.0)
bundler-audit (~> 0.6.1) bundler-audit (~> 0.6.1)
capybara (~> 3.33.0) capybara (~> 3.33.0)
capybara-screenshot (~> 1.0.22) capybara-screenshot (~> 1.0.22)
......
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