From 01eda90a0021d18a1292d246ebef4480b053a20d Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 21 May 2020 12:54:38 +0100
Subject: [PATCH 1/2] Upgrade bundler, byebug and pry-byebug

---
 Gemfile      |  4 ++--
 Gemfile.lock | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8be63cff96..1a5924824f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -146,10 +146,10 @@ group :test do
 end
 
 group :development do
-  gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
+  gem 'byebug', '~> 11.0' # 11.1 requires ruby 2.4
   gem 'debugger-linecache'
   gem "newrelic_rpm", "~> 3.0"
-  gem 'pry-byebug', '>= 3.4.3'
+  gem 'pry-byebug', '~> 3.7' # 3.8 requires ruby 2.4
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring', '1.7.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 34fb2cd5e0..665e0e37dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
     bugsnag (6.13.1)
       concurrent-ruby (~> 1.0)
     builder (3.0.4)
-    byebug (9.0.6)
+    byebug (11.0.1)
     cancan (1.6.10)
     capybara (2.18.0)
       addressable
@@ -446,7 +446,7 @@ GEM
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (1.25.1)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
@@ -495,11 +495,11 @@ GEM
       activerecord (~> 3.0)
     polyglot (0.3.5)
     power_assert (1.1.5)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.4.3)
-      byebug (>= 9.0, < 9.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.3)
     rack (1.4.7)
@@ -700,7 +700,7 @@ DEPENDENCIES
   aws-sdk
   blockenspiel
   bugsnag
-  byebug (~> 9.0.0)
+  byebug (~> 11.0)
   capybara (>= 2.18.0)
   catalog!
   coffee-rails (~> 3.2.1)
@@ -750,7 +750,7 @@ DEPENDENCIES
   paper_trail (~> 5.2.3)
   paperclip (~> 3.4.1)
   pg (~> 0.21.0)
-  pry-byebug (>= 3.4.3)
+  pry-byebug (~> 3.7)
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl
@@ -796,4 +796,4 @@ RUBY VERSION
    ruby 2.3.7p456
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

From 574e4a02c0cf16e5ad2a925afc2fbb7115d68947 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 21 May 2020 13:10:59 +0100
Subject: [PATCH 2/2] Force pry to 0.12 so that it works well with pry-byebug
 3.7

---
 Gemfile      | 1 +
 Gemfile.lock | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1a5924824f..4076add5b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,6 +149,7 @@ group :development do
   gem 'byebug', '~> 11.0' # 11.1 requires ruby 2.4
   gem 'debugger-linecache'
   gem "newrelic_rpm", "~> 3.0"
+  gem "pry", "~> 0.12.0" # pry 0.13 is not compatible with pry-byebug 3.7
   gem 'pry-byebug', '~> 3.7' # 3.8 requires ruby 2.4
   gem 'rubocop'
   gem 'rubocop-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 665e0e37dc..acf21deb59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -446,7 +446,7 @@ GEM
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (1.0.0)
+    method_source (0.9.2)
     mime-types (1.25.1)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
@@ -495,9 +495,9 @@ GEM
       activerecord (~> 3.0)
     polyglot (0.3.5)
     power_assert (1.1.5)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
@@ -750,6 +750,7 @@ DEPENDENCIES
   paper_trail (~> 5.2.3)
   paperclip (~> 3.4.1)
   pg (~> 0.21.0)
+  pry (~> 0.12.0)
   pry-byebug (~> 3.7)
   rack-mini-profiler (< 3.0.0)
   rack-rewrite