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 /Gemfile | |
| 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
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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' |