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

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

1 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20200113125135_create_announcement_mutes.rb b/db/migrate/20200113125135_create_announcement_mutes.rb
new file mode 100644
index 000000000..c588e7fcd
--- /dev/null
+++ b/db/migrate/20200113125135_create_announcement_mutes.rb
@@ -0,0 +1,12 @@
+class CreateAnnouncementMutes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :announcement_mutes do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade, index: false }
+      t.belongs_to :announcement, foreign_key: { on_delete: :cascade }
+
+      t.timestamps
+    end
+
+    add_index :announcement_mutes, [:account_id, :announcement_id], unique: true
+  end
+end