diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /app/models/report.rb | |
parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'app/models/report.rb')
-rw-r--r-- | app/models/report.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/report.rb b/app/models/report.rb index f55fb6d3e..dd123fc15 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -24,6 +24,10 @@ class Report < ApplicationRecord validates :comment, length: { maximum: 1000 } + def object_type + :flag + end + def statuses Status.where(id: status_ids).includes(:account, :media_attachments, :mentions) end |