Update annotations on Follow, FollowRequest, and Mute.

Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.

diff --git a/app/models/follow.rb b/app/models/follow.rb
index b82da722724fc764c4ebda3b855fb028507eecfe..3fb665afc74ccc2a1a4d613a792a6835af530401 100644 (file)
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -6,9 +6,8 @@
 #  id                :integer          not null, primary key
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
-#  account_id        :bigint          not null
-#  id                :bigint          not null, primary key
-#  target_account_id :bigint          not null
+#  account_id        :integer          not null
+#  target_account_id :integer          not null
 #  show_reblogs      :boolean          default(TRUE), not null
 #
 

diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 21f01e18b197ca95302ede4c2acf7cd553142f6e..ebf6959cef77bb690fd83cb0981b6a97ce55f2b1 100644 (file)
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -6,9 +6,8 @@
 #  id                :integer          not null, primary key
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
-#  account_id        :bigint          not null
-#  id                :bigint          not null, primary key
-#  target_account_id :bigint          not null
+#  account_id        :integer          not null
+#  target_account_id :integer          not null
 #  show_reblogs      :boolean          default(TRUE), not null
 #
 

diff --git a/app/models/mute.rb b/app/models/mute.rb
index 74b445c0b9233920a9ac07e158191cb980e3cdd2..ca984641a5a91b736f8454f438067084462f1df5 100644 (file)
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -3,12 +3,12 @@
 #
 # Table name: mutes
 #
-#  id                 :bigint          not null, primary key
+#  id                 :integer          not null, primary key
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
-#  account_id         :bigint          not null
-#  target_account_id  :bigint          not null
 #  hide_notifications :boolean          default(TRUE), not null
+#  account_id         :integer          not null
+#  target_account_id  :integer          not null
 #
 
 class Mute < ApplicationRecord

diff --git a/db/schema.rb b/db/schema.rb
index c2de168857193966a2be0084b564cc1a1c424562..10e35cd7deba7bff9c7eae98005bfd65db448113 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -234,7 +234,6 @@ ActiveRecord::Schema.define(version: 20171116161857) do
     t.boolean "hide_notifications", default: true, null: false
     t.bigint "account_id", null: false
     t.bigint "target_account_id", null: false
-    t.boolean "hide_notifications", default: true, null: false
     t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
   end