summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-03-24 20:21:32 -0600
committerconnorshea <connor.james.shea@gmail.com>2016-03-24 20:21:32 -0600
commit8d2ded95c89de74bacdfdeda894636b511e06953 (patch)
tree0505e0c9502142573b00a3f7bcf9e84f6eef7d89 /Gemfile.lock
parent28c94ee955888c48547c02f5d60698faa7aa7b58 (diff)
downloadgitlab-ce-8d2ded95c89de74bacdfdeda894636b511e06953.tar.gz
Upgrade Bullet to 5.0.0
Includes Rails 5 support. See changelog for details (https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 16c09ab6e6d..4f9c404dc6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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