Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts:
 	Gemfile.lock
pull/457/head
David Yip 2018-05-04 09:42:31 -05:00
commit 77a92d3260
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
6 changed files with 14 additions and 6 deletions

View File

@ -62,6 +62,7 @@ gem 'nsa', '~> 0.2'
gem 'oj', '~> 3.5'
gem 'ostatus2', '~> 2.0'
gem 'ox', '~> 2.9'
gem 'posix-spawn', '~> 0.3'
gem 'pundit', '~> 1.1'
gem 'premailer-rails'
gem 'rack-attack', '~> 5.2'

View File

@ -709,7 +709,7 @@ DEPENDENCIES
pg (~> 1.0)
pghero (~> 2.1)
pkg-config (~> 1.3)
posix-spawn
posix-spawn (~> 0.3)
premailer-rails
private_address_check (~> 0.4.1)
pry-byebug (~> 3.6)

View File

@ -4,7 +4,10 @@
%td.target
= admin_account_link_to report.target_account
%td.reporter
= admin_account_link_to report.account
- if report.account.local?
= admin_account_link_to report.account
- else
= report.account.domain
%td
%div{ title: report.comment }
= truncate(report.comment, length: 30, separator: ' ')

View File

@ -23,9 +23,12 @@
%td= table_link_to 'file', pluralize(@report.target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.target_account.id)
%tr
%th= t('admin.reports.reported_by')
%td= admin_account_link_to @report.account
%td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id)
%td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id)
- if @report.account.local?
%td= admin_account_link_to @report.account
%td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id)
%td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id)
- else
%td{ colspan: 3 }= @report.account.domain
%tr
%th= t('admin.reports.created_at')
%td{ colspan: 3 }

View File

@ -1,5 +1,5 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) %>
<%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %>
<%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %>

View File

@ -376,6 +376,7 @@ en:
admin_mailer:
new_report:
body: "%{reporter} has reported %{target}"
body_remote: Someone from %{domain} has reported %{target}
subject: New report for %{instance} (#%{id})
application_mailer:
notification_preferences: Change e-mail preferences