Merge 4a4ce992dd into 7d2dda97b3

Remove the "to triage" label status (#35394 )
Merge branch 'main' into improve-migrate-warnings
2025-07-18 02:08:16 +00:00 · 2025-07-16 08:04:43 +00:00 · 2025-07-16 07:17:21 +00:00 · 2025-01-09 15:45:06 +01:00 · 2022-11-10 22:47:58 -05:00 · 2022-11-10 22:45:07 -05:00
4 changed files with 3 additions and 4 deletions
--- a/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
@ -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
--- a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
@ -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
--- a/app/views/settings/migrations/show.html.haml
+++ b/app/views/settings/migrations/show.html.haml
@ -30,8 +30,8 @@
    %ul.hint
      %li.warning-hint= t('migrations.warning.followers')
      %li.warning-hint= t('migrations.warning.redirect')
      %li.warning-hint= t('migrations.warning.other_data')
      %li.warning-hint= t('migrations.warning.redirect')
      %li.warning-hint= t('migrations.warning.backreference_required')
      %li.warning-hint= t('migrations.warning.cooldown')
      %li.warning-hint= t('migrations.warning.disabled_account')
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1626,7 +1626,7 @@ en:
      disabled_account: Your current account will not be fully usable afterwards. However, you will have access to data export as well as re-activation.
      followers: This action will move all followers from the current account to the new account
      only_redirect_html: Alternatively, you can <a href="%{path}">only put up a redirect on your profile</a>.
-      other_data: No other data will be moved automatically
+      other_data: No other data will be moved automatically (includes your posts and the list of accounts you follow)
      redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches
  moderation:
    title: Moderation
Author	SHA1	Message	Date
Josh Soref	c87ffb5862	Merge `4a4ce992dd` 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 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 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 / test (3.3) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.3) (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 / End to End testing (3.3) (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 Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details	2025-07-16 07:17:21 +00:00
Claire	4a4ce992dd	Merge branch 'main' into improve-migrate-warnings	2025-01-09 15:45:06 +01:00
Josh Soref	eba662d8d2	Clarify that posts and accounts to follow will be left behind	2022-11-10 22:47:58 -05:00
Josh Soref	dd098e63b1	Prioritize other data over redirect	2022-11-10 22:45:07 -05:00