Merge branch 'master' into glitch-soc/merge-upstream

2019-03-06 11:29:06 +01:00
parent e80fabfd84 ad6f7ea250
commit 4806232997
28 changed files with 476 additions and 35 deletions
--- a/2
+++ b/2
@@ -120,7 +120,7 @@ group :test do
 end

 group :development do
-  gem 'active_record_query_trace', '~> 1.5'
+  gem 'active_record_query_trace', '~> 1.6'
  gem 'annotate', '~> 2.7'
  gem 'better_errors', '~> 2.5'
  gem 'binding_of_caller', '~> 0.7'