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

Merge pull request #159 from kmycode/upstream-20231021

Browse source 
Upstream 20231021
This commit is contained in:
KMY（雪あすか） 2023-10-26 10:07:09 +09:00 • committed by GitHub
commit 551a9e8216
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
133 changed files with 1159 additions and 817 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/disputes/appeals/_appeal.html.haml
View file

@ -4,7 +4,7 @@
= image_tag appeal.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
.log-entry__content
.log-entry__title
= t(appeal.strike.action, scope: 'admin.strikes.actions', name: content_tag(:span, appeal.strike.account.username, class: 'username'), target: content_tag(:span, appeal.account.username, class: 'target')).html_safe
= strike_action_label(appeal)
.log-entry__timestamp
%time.formatted{ datetime: appeal.strike.created_at.iso8601 }
= l(appeal.strike.created_at)

2
app/views/admin/trends/links/_preview_card.html.haml
View file

@ -4,7 +4,7 @@
.batch-table__row__content.pending-account
.pending-account__header
= link_to preview_card.title, preview_card.url
= link_to preview_card.title, url_for_preview_card(preview_card)
%br/