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

2018-11-09 14:56:31 +01:00
parent a2a254625b ed7c5f94f7
commit 9201398507
26 changed files with 191 additions and 97 deletions
--- a/2
+++ b/2
@@ -123,7 +123,7 @@ group :development do
  gem 'annotate', '~> 2.7'
  gem 'better_errors', '~> 2.5'
  gem 'binding_of_caller', '~> 0.7'
-  gem 'bullet', '~> 5.7'
+  gem 'bullet', '~> 5.8'
  gem 'letter_opener', '~> 1.4'
  gem 'letter_opener_web', '~> 1.3'
  gem 'memory_profiler'