diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-22 14:40:29 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-26 11:06:44 -0600 |
| commit | 9116ec57bba8ede272bf167954e7e903a687c8ac (patch) | |
| tree | 409ce5fa62787565df16c92b8cf4c0d357599dfe | |
| parent | 9ccfac275f203459c67290ab3d5f69ac09085276 (diff) | |
| download | gitlab-ce-cs-upgrade-bullet.tar.gz | |
Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bullet
Removes methods that were deprecated in Rails 5.
Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -252,7 +252,7 @@ group :development do gem 'letter_opener_web', '~> 1.3.0' gem 'rerun', '~> 0.11.0' - gem 'bullet', '~> 5.0.0', require: false + gem 'bullet', '~> 5.2.0', require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'web-console', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 195516d1bf1..c69906cd2c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,9 +100,9 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.0.0) + bullet (5.2.0) activesupport (>= 3.0.0) - uniform_notifier (~> 1.9.0) + uniform_notifier (~> 1.10.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) @@ -766,7 +766,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.9.0) + uniform_notifier (1.10.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -821,7 +821,7 @@ DEPENDENCIES bootstrap-sass (~> 3.3.0) brakeman (~> 3.3.0) browser (~> 2.2) - bullet (~> 5.0.0) + bullet (~> 5.2.0) bundler-audit (~> 0.5.0) byebug (~> 8.2.1) capybara (~> 2.6.2) |