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.
This commit is contained in:
		@@ -6,9 +6,8 @@
 | 
				
			|||||||
#  id                :integer          not null, primary key
 | 
					#  id                :integer          not null, primary key
 | 
				
			||||||
#  created_at        :datetime         not null
 | 
					#  created_at        :datetime         not null
 | 
				
			||||||
#  updated_at        :datetime         not null
 | 
					#  updated_at        :datetime         not null
 | 
				
			||||||
#  account_id        :bigint          not null
 | 
					#  account_id        :integer          not null
 | 
				
			||||||
#  id                :bigint          not null, primary key
 | 
					#  target_account_id :integer          not null
 | 
				
			||||||
#  target_account_id :bigint          not null
 | 
					 | 
				
			||||||
#  show_reblogs      :boolean          default(TRUE), not null
 | 
					#  show_reblogs      :boolean          default(TRUE), not null
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,9 +6,8 @@
 | 
				
			|||||||
#  id                :integer          not null, primary key
 | 
					#  id                :integer          not null, primary key
 | 
				
			||||||
#  created_at        :datetime         not null
 | 
					#  created_at        :datetime         not null
 | 
				
			||||||
#  updated_at        :datetime         not null
 | 
					#  updated_at        :datetime         not null
 | 
				
			||||||
#  account_id        :bigint          not null
 | 
					#  account_id        :integer          not null
 | 
				
			||||||
#  id                :bigint          not null, primary key
 | 
					#  target_account_id :integer          not null
 | 
				
			||||||
#  target_account_id :bigint          not null
 | 
					 | 
				
			||||||
#  show_reblogs      :boolean          default(TRUE), not null
 | 
					#  show_reblogs      :boolean          default(TRUE), not null
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,12 +3,12 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
# Table name: mutes
 | 
					# Table name: mutes
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
#  id                 :bigint          not null, primary key
 | 
					#  id                 :integer          not null, primary key
 | 
				
			||||||
#  created_at         :datetime         not null
 | 
					#  created_at         :datetime         not null
 | 
				
			||||||
#  updated_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
 | 
					#  hide_notifications :boolean          default(TRUE), not null
 | 
				
			||||||
 | 
					#  account_id         :integer          not null
 | 
				
			||||||
 | 
					#  target_account_id  :integer          not null
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Mute < ApplicationRecord
 | 
					class Mute < ApplicationRecord
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -234,7 +234,6 @@ ActiveRecord::Schema.define(version: 20171116161857) do
 | 
				
			|||||||
    t.boolean "hide_notifications", default: true, null: false
 | 
					    t.boolean "hide_notifications", default: true, null: false
 | 
				
			||||||
    t.bigint "account_id", null: false
 | 
					    t.bigint "account_id", null: false
 | 
				
			||||||
    t.bigint "target_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
 | 
					    t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user