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

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency

config/initializers/redis.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+Redis.exists_returns_integer = false
+
 redis_connection = Redis.new(
   url: ENV['REDIS_URL'],
   driver: :hiredis