Commit 8edb3163 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'upgrade-bullet' into 'master'

Upgrade Bullet to 5.0.0

Includes Rails 5 support.

[See changelog for details](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).

Working towards #14286.

See merge request !3396
parents cff31423 8d2ded95
......@@ -98,7 +98,7 @@ GEM
terminal-table (~> 1.4)
browser (1.0.1)
builder (3.2.2)
bullet (4.14.10)
bullet (5.0.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
bundler-audit (0.4.0)
......@@ -1064,3 +1064,6 @@ DEPENDENCIES
web-console (~> 2.0)
webmock (~> 1.21.0)
wikicloth (= 0.8.1)
BUNDLED WITH
1.11.2
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