gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge commit 'c40cfc5d09' into upstream-20231129

Browse source
This commit is contained in:
KMY 2023-11-29 12:43:01 +09:00
commit 16914f5f02
50 changed files with 851 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/accounts/show.html.haml
View file

@ -9,7 +9,7 @@
%meta{ name: 'robots', content: 'noai, noimageai' }/
%meta{ name: 'CCBot', content: 'nofollow' }/
%link{ rel: 'alternate', type: 'application/rss+xml', href: @rss_url }/
%link{ rel: 'alternate', type: 'application/rss+xml', href: rss_url }/
%link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
- @account.fields.select(&:verifiable?).each do |field|

2
app/views/admin_mailer/new_appeal.text.erb
View file

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_appeal.body', target: @appeal.account.username, action_taken_by: @appeal.strike.account.username, date: l(@appeal.strike.created_at, format: :with_time_zone), type: t(@appeal.strike.action, scope: 'admin_mailer.new_appeal.actions')) %>
> <%= raw word_wrap(@appeal.text, break_sequence: "\n> ") %>

2
app/views/admin_mailer/new_critical_software_updates.text.erb
View file

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_critical_software_updates.body') %>
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>

2
app/views/admin_mailer/new_pending_account.text.erb
View file

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_pending_account.body') %>
<%= @account.user_email %> (@<%= @account.username %>)

2
app/views/admin_mailer/new_report.text.erb
View file

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.pretty_acct, reporter: @report.account.pretty_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) %>

2
app/views/admin_mailer/new_software_updates.text.erb
View file

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_software_updates.body') %>
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>

2
app/views/admin_mailer/new_trends.text.erb
View file

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_trends.body') %>
<%= render partial: 'new_trending_links', object: @links unless @links.empty? %>

3
app/views/layouts/admin_mailer.text.erb Normal file
View file

@ -0,0 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= yield %>