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

Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes
2020-10-26 15:47:21 +01:00
parent 36e5c9d45b 3678b10823
commit 9c34090db8
8 changed files with 534 additions and 544 deletions
--- a/2
+++ b/2
@@ -133,7 +133,7 @@ group :test do
 end

 group :development do
-  gem 'active_record_query_trace', '~> 1.7'
+  gem 'active_record_query_trace', '~> 1.8'
  gem 'annotate', '~> 3.1'
  gem 'better_errors', '~> 2.8'
  gem 'binding_of_caller', '~> 0.7'