diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-05 16:07:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-05 16:07:25 +0000 |
| commit | 90938e4b1745692e543df4f3defa596ffb33d441 (patch) | |
| tree | 6b7b7047ade1134f586435f687ba299e58557487 | |
| parent | 30815a8940c642fa738203da9eda8046eaa0da10 (diff) | |
| parent | 4f5c020a3548094ae4fc1a6a55de0aaa2f4431fe (diff) | |
| download | gitlab-ce-90938e4b1745692e543df4f3defa596ffb33d441.tar.gz | |
Merge branch 'pry-byebug' into 'master'
Use pry-byebug instead byebug
See merge request !7925
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -264,7 +264,7 @@ group :development do end group :development, :test do - gem 'byebug', '~> 8.2.1', platform: :mri + gem 'pry-byebug', '~> 3.4.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', '~> 1.2.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index e5e6e6895a8..7a024e81ad2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.6) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -483,6 +483,9 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + pry-byebug (3.4.1) + byebug (~> 9.0) + pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) @@ -796,7 +799,6 @@ DEPENDENCIES browser (~> 2.2) bullet (~> 5.2.0) bundler-audit (~> 0.5.0) - byebug (~> 8.2.1) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) @@ -891,6 +893,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) + pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) |