Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-15 01:17:12 +00:00
parent e5a9831a56 098c7d27fe
commit 37254c4f5d
11 changed files with 80 additions and 74 deletions
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@@ -28,6 +28,7 @@ class Settings::MigrationsController < ApplicationController
  end

  def migration_account_changed?
-    current_account.moved_to_account_id != @migration.account&.id
+    current_account.moved_to_account_id != @migration.account&.id &&
+      current_account.id != @migration.account&.id
  end
 end