Compare commits

...

6 Commits

Author SHA1 Message Date
Jeong Arm
bbefae26b9
Merge 7cf767a978 into 7d2dda97b3 2025-07-16 08:04:43 +00:00
Renaud Chaput
7d2dda97b3
Remove the "to triage" label status (#35394)
Some checks are pending
Check i18n / check-i18n (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
CodeQL / Analyze (ruby) (push) Waiting to run
Check formatting / lint (push) Waiting to run
Ruby Testing / build (production) (push) Waiting to run
Ruby Testing / build (test) (push) Waiting to run
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Ruby Testing / test (3.2) (push) Blocked by required conditions
Ruby Testing / test (3.3) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
2025-07-16 07:17:21 +00:00
Jeong Arm
7cf767a978 Fix i18n lint 2024-05-27 22:59:37 +09:00
Jeong Arm
11a2c73814 Fix ruby test error 2024-05-27 22:51:16 +09:00
Jeong Arm
967c8f9d25 Fix follows note carry over 2024-05-27 22:25:11 +09:00
Jeong Arm
0bf50cbbbe Add moved note for newly followed via migration 2024-05-27 22:25:10 +09:00
4 changed files with 11 additions and 2 deletions

View File

@ -1,6 +1,6 @@
name: Bug Report (Web Interface)
description: There is a problem using Mastodon's web interface.
labels: ['status/to triage', 'area/web interface']
labels: ['area/web interface']
type: Bug
body:
- type: markdown

View File

@ -1,7 +1,6 @@
name: Bug Report (server / API)
description: |
There is a problem with the HTTP server, REST API, ActivityPub interaction, etc.
labels: ['status/to triage']
type: 'Bug'
body:
- type: markdown

View File

@ -20,6 +20,7 @@ class MoveWorker
copy_account_notes!
carry_blocks_over!
carry_mutes_over!
carry_follows_over!
raise @deferred_error unless @deferred_error.nil?
rescue ActiveRecord::RecordNotFound
@ -122,6 +123,14 @@ class MoveWorker
end
end
def carry_follows_over!
@source_account.followers.local.reorder(nil).find_each do |follower|
add_account_note_if_needed!(follower, 'move_handler.carry_follows_over_text')
rescue => e
@deferred_error = e
end
end
def add_account_note_if_needed!(account, id)
unless AccountNote.exists?(account: account, target_account: @target_account)
text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do

View File

@ -1632,6 +1632,7 @@ en:
title: Moderation
move_handler:
carry_blocks_over_text: This user moved from %{acct}, which you had blocked.
carry_follows_over_text: This user moved from %{acct}, which you had followed.
carry_mutes_over_text: This user moved from %{acct}, which you had muted.
copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
navigation: