fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 03:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update annotations on Follow, FollowRequest, and Mute.

Browse source 
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:
David Yip 2017-11-17 17:41:15 -06:00
parent 1ab12ba38e
commit 130aa90d55
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/follow.rb
View file

@ -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
# #

5
app/models/follow_request.rb
View file

@ -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
app/models/mute.rb
View file

@ -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

1
db/schema.rb
View file

@ -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