gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 07:21:51 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix error when viewing statuses to deleted replies in moderation view (#32986)
Some checks failed
Check i18n / check-i18n (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
CodeQL / Analyze (ruby) (push) Waiting to run
Details
Check formatting / lint (push) Waiting to run
Details
Haml Linting / lint (push) Waiting to run
Details
Ruby Testing / build (production) (push) Waiting to run
Details
Ruby Testing / build (test) (push) Waiting to run
Details
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / test (3.2) (push) Blocked by required conditions
Details
Ruby Testing / Libvips tests (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / Libvips tests (3.2) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Details
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Details
Build nightly container image / compute-suffix (push) Has been cancelled
Details
Crowdin / Download translations / download-translations (push) Has been cancelled
Details
Build nightly container image / build-image (push) Has been cancelled
Details
Build nightly container image / build-image-streaming (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Claire 2024-11-19 21:21:12 +01:00 committed by GitHub
parent 37f00fb018
commit 30e9c7137b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/reports/_status.html.haml
View File

@ -10,7 +10,7 @@
- elsif status.reply? && status.in_reply_to_id.present? - elsif status.reply? && status.in_reply_to_id.present?
.status__prepend .status__prepend
= material_symbol('reply') = material_symbol('reply')
= t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(status.in_reply_to_account, path: admin_account_status_path(status.thread.account_id, status.in_reply_to_id))) = t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(status.in_reply_to_account, path: status.thread.present? ? admin_account_status_path(status.thread.account_id, status.in_reply_to_id) : nil))
.status__content>< .status__content><
- if status.proper.spoiler_text.blank? - if status.proper.spoiler_text.blank?
= prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis) = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis)

4
app/views/admin/statuses/show.html.haml
View File

@ -22,7 +22,7 @@
- if @status.reply? - if @status.reply?
%tr %tr
%th= t('admin.statuses.in_reply_to') %th= t('admin.statuses.in_reply_to')
%td= admin_account_link_to @status.in_reply_to_account, path: admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id) %td= admin_account_link_to @status.in_reply_to_account, path: @status.thread.present? ? admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id) : nil
%tr %tr
%th= t('admin.statuses.application') %th= t('admin.statuses.application')
%td= @status.application&.name %td= @status.application&.name
@ -61,7 +61,7 @@
- elsif @status.reply? && @status.in_reply_to_id.present? - elsif @status.reply? && @status.in_reply_to_id.present?
.status__prepend .status__prepend
= material_symbol('reply') = material_symbol('reply')
= t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(@status.in_reply_to_account, path: admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id))) = t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(@status.in_reply_to_account, path: @status.thread.present? ? admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id) : nil))
.status__content>< .status__content><
- if @status.proper.spoiler_text.blank? - if @status.proper.spoiler_text.blank?
= prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis) = prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis)