diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-09 13:00:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 13:00:24 +0200 |
| commit | 3287a10fe9658a6c370431a925abc50d4f68ea08 (patch) | |
| tree | 88a408a943aa421a6ba844d309f673150cd92434 /app/controllers/settings | |
| parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
| parent | e9d7ca7645fc37534df1222e8d7ab8f3d533b852 (diff) | |
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/migration/redirects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/migration/redirects_controller.rb b/app/controllers/settings/migration/redirects_controller.rb index 6e5b72ffb..97193ade0 100644 --- a/app/controllers/settings/migration/redirects_controller.rb +++ b/app/controllers/settings/migration/redirects_controller.rb @@ -18,7 +18,7 @@ class Settings::Migration::RedirectsController < Settings::BaseController if @redirect.valid_with_challenge?(current_user) current_account.update!(moved_to_account: @redirect.target_account) ActivityPub::UpdateDistributionWorker.perform_async(current_account.id) - redirect_to settings_migration_path, notice: I18n.t('migrations.moved_msg', acct: current_account.moved_to_account.acct) + redirect_to settings_migration_path, notice: I18n.t('migrations.redirected_msg', acct: current_account.moved_to_account.acct) else render :new end |