about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-11-17 17:41:15 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-11-17 17:41:15 -0600
commit130aa90d5500f481c181a16012724b5f81d62616 (patch)
tree739fe0417fce9b9f48f924815b436a50b324dfe9 /app
parent1ab12ba38ebd42be93b63b7cf0d3c6a81060b741 (diff)
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.
Diffstat (limited to 'app')
-rw-r--r--app/models/follow.rb5
-rw-r--r--app/models/follow_request.rb5
-rw-r--r--app/models/mute.rb6
3 files changed, 7 insertions, 9 deletions
diff --git a/app/models/follow.rb b/app/models/follow.rb
index b82da7227..3fb665afc 100644
--- 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 21f01e18b..ebf6959ce 100644
--- 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 74b445c0b..ca984641a 100644
--- 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