diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-27 17:31:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-27 17:31:16 +0000 |
| commit | e9f5676aab010ace9bb45251337d8527df8278dc (patch) | |
| tree | a6da72a12be960c7ece464da42720b4443ed1d3b | |
| parent | 0d022db54e97a7b553bee8f8fef8704b8c41c35b (diff) | |
| parent | 9116ec57bba8ede272bf167954e7e903a687c8ac (diff) | |
| download | gitlab-ce-e9f5676aab010ace9bb45251337d8527df8278dc.tar.gz | |
Merge branch 'cs-upgrade-bullet' into 'master'
Upgrade Bullet from 5.0.0 to 5.2.0
Removes methods that were deprecated in Rails 5. Working toward #14286.
Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520-07262016
See merge request !5443
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -253,7 +253,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 2861c423819..a773c571989 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,9 +104,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) @@ -775,7 +775,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) @@ -830,7 +830,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) |