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

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

db/migrate/20181213184704_create_account_warnings.rb

@@ -0,0 +1,12 @@
+class CreateAccountWarnings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_warnings do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :nullify }
+      t.belongs_to :target_account, foreign_key: { to_table: 'accounts', on_delete: :cascade }
+      t.integer :action, null: false, default: 0
+      t.text :text, null: false, default: ''
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20181213185533_create_account_warning_presets.rb

@@ -0,0 +1,9 @@
+class CreateAccountWarningPresets < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_warning_presets do |t|
+      t.text :text, null: false, default: ''
+
+      t.timestamps
+    end
+  end
+end