aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2015-04-26 01:27:02 -0400
committerGodfrey Chan <godfreykfc@gmail.com>2015-04-26 01:27:02 -0400
commit6a9d81800b04126a3f57b6595d48cee47ceeb3cf (patch)
tree6043a8e4c68be7a4357ab508bab5dd5a03744fa6
parent951ec0325621c9d67cb2f13d5d6de4e3983fae0e (diff)
parent78b51a80715f47ffdc9a2eec4d998a1db4ce723e (diff)
downloadrails-6a9d81800b04126a3f57b6595d48cee47ceeb3cf.tar.gz
rails-6a9d81800b04126a3f57b6595d48cee47ceeb3cf.tar.bz2
rails-6a9d81800b04126a3f57b6595d48cee47ceeb3cf.zip
Merge pull request #19884 from chancancode/uncomment-byebug
Uncomment byebug in framework Gemfile
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ddaaacdc59..47e87f75cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ group :test do
platforms :mri do
gem 'stackprof'
- # gem 'byebug'
+ gem 'byebug'
end
gem 'benchmark-ips'
diff --git a/Gemfile.lock b/Gemfile.lock
index 543cfaf3da..01fd38f4c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,6 +106,8 @@ GEM
builder (3.2.2)
bunny (1.1.9)
amq-protocol (>= 1.9.2)
+ byebug (4.0.5)
+ columnize (= 0.9.0)
celluloid (0.16.0)
timers (~> 4.0.0)
coffee-rails (4.1.0)
@@ -115,6 +117,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.0)
+ columnize (0.9.0)
connection_pool (2.1.1)
dalli (2.7.2)
dante (0.1.5)
@@ -258,6 +261,7 @@ DEPENDENCIES
backburner
bcrypt (~> 3.1.10)
benchmark-ips
+ byebug
coffee-rails (~> 4.1.0)
dalli (>= 2.2.1)
delayed_job