From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Apr 2018 20:26:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1815'
X-Git-Tag: live~3134
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4c9ec6a60cbd973ab637123a71894c4c97e8965f?hp=2160f820ac9fe3f78deb97a3a4285e9bf8daa095

Merge remote-tracking branch 'upstream/pull/1815'
---

diff --git a/Gemfile b/Gemfile
index 09c662e4a..7d59cceb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,6 +105,8 @@ gem "logstasher"
 # Gems useful for development
 group :development do
   gem "annotate"
+  gem "better_errors"
+  gem "binding_of_caller"
   gem "listen"
   gem "vendorer"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e4448fddc..2869ebad2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,7 +50,13 @@ GEM
     ast (2.4.0)
     autoprefixer-rails (8.2.0)
       execjs
+    better_errors (2.4.0)
+      coderay (>= 1.0.0)
+      erubi (>= 1.0.0)
+      rack (>= 0.9.0)
     bigdecimal (1.1.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.2.3)
     canonical-rails (0.2.2)
       rails (>= 4.1, < 5.2)
@@ -63,6 +69,7 @@ GEM
       xpath (>= 2.0, < 4.0)
     climate_control (0.2.0)
     cliver (0.3.2)
+    coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -83,6 +90,7 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.3)
     dalli (2.7.6)
+    debug_inspector (0.0.2)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubi (1.7.1)
@@ -357,7 +365,9 @@ DEPENDENCIES
   actionpack-page_caching
   annotate
   autoprefixer-rails
+  better_errors
   bigdecimal (~> 1.1.0)
+  binding_of_caller
   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)