diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:58:13 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-17 17:58:13 -0600 |
commit | 284e2cde81811d6289dde9542f9c987062f9e7c2 (patch) | |
tree | 739fe0417fce9b9f48f924815b436a50b324dfe9 /app/models/report.rb | |
parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
parent | 130aa90d5500f481c181a16012724b5f81d62616 (diff) |
Merge pull request #224 from yipdw/merge-upstream
Merge upstream (tootsuite/mastodon#5703)
Diffstat (limited to 'app/models/report.rb')
-rw-r--r-- | app/models/report.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/report.rb b/app/models/report.rb index 99c90b7dd..c36f8db0a 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -3,15 +3,15 @@ # # Table name: reports # +# id :integer not null, primary key # status_ids :integer default([]), not null, is an Array # comment :text default(""), not null # action_taken :boolean default(FALSE), not null # created_at :datetime not null # updated_at :datetime not null -# account_id :bigint not null -# action_taken_by_account_id :bigint -# id :bigint not null, primary key -# target_account_id :bigint not null +# account_id :integer not null +# action_taken_by_account_id :integer +# target_account_id :integer not null # class Report < ApplicationRecord |