diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:41:15 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:41:15 -0600 |
| commit | 130aa90d5500f481c181a16012724b5f81d62616 (patch) | |
| tree | 739fe0417fce9b9f48f924815b436a50b324dfe9 | |
| parent | 1ab12ba38ebd42be93b63b7cf0d3c6a81060b741 (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.
| -rw-r--r-- | app/models/follow.rb | 5 | ||||
| -rw-r--r-- | app/models/follow_request.rb | 5 | ||||
| -rw-r--r-- | app/models/mute.rb | 6 | ||||
| -rw-r--r-- | db/schema.rb | 1 |
4 files changed, 7 insertions, 10 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 diff --git a/db/schema.rb b/db/schema.rb index c2de16885..10e35cd7d 100644 --- 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 |