Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add (back) option to set redirect notice on account without moving followers (#11994)

Browse source 
Fix #11913
This commit is contained in:
Eugen Rochko 2019-09-29 05:03:19 +02:00 • committed by GitHub
parent b0cda7a504
commit 163ed91af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 144 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/settings/migrations_controller.rb
View file

@ -27,15 +27,6 @@ class Settings::MigrationsController < Settings::BaseController
end
end
def cancel
if current_account.moved_to_account_id.present?
current_account.update!(moved_to_account: nil)
ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
end
redirect_to settings_migration_path, notice: I18n.t('migrations.cancelled_msg')
end
helper_method :on_cooldown?
private