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

Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
2018-10-05 15:23:57 +02:00
parent a9e8f98a9d 028ad4124c
commit 00fcdebed7
93 changed files with 406 additions and 324 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@ -11,7 +11,6 @@
 # It's strongly recommended that you check this file into your version control system.

 ActiveRecord::Schema.define(version: 2018_08_20_232245) do
-
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"