summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-12-20 18:26:10 -0700
committermo khan <mo@mokhan.ca>2014-12-20 18:26:10 -0700
commit2a4fdc5222f511fada3217a6f03d46e2713e9c89 (patch)
treef1fdff2d6638d024fefbe77d5727e8a1c8d24595
parentfdfaf54b78626e6baf49b0f99b29d7dd92e39c1e (diff)
re-add bullet gem.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 79702e26..a0dddba2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ group :development do
gem 'capistrano-rails'
gem 'capistrano-bundler', '~> 1.1', require: false
gem 'capistrano-rbenv', '~> 2.0', require: false
- #gem 'bullet'
+ gem 'bullet'
gem 'better_errors'
gem 'lol_dba'
gem 'pry-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 649eb85f..fa864030 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,6 +84,9 @@ GEM
browser_sniffer (1.0.7)
buftok (0.2.0)
builder (3.2.2)
+ bullet (4.14.0)
+ activesupport (>= 3.0.0)
+ uniform_notifier (>= 1.6.0)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
@@ -421,6 +424,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
+ uniform_notifier (1.6.2)
web-console (2.0.0)
activemodel (~> 4.0)
binding_of_caller (>= 0.7.2)
@@ -445,6 +449,7 @@ DEPENDENCIES
binding_of_caller
bootstrap-sass (~> 2.3.0)
browser_sniffer
+ bullet
byebug
capistrano-bundler (~> 1.1)
capistrano-rails