about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-15 01:17:12 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-15 01:17:12 +0000
commit37254c4f5d1f4397551c94e59a4d474f444b1d9a (patch)
tree8975374e2cbfced954f1bfc6de6de2652ceccf30 /app/controllers
parente5a9831a56e7fdc0a767f0d8a059bebeabeed22f (diff)
parent098c7d27fe3a2d35d555f415717b9e019504dd91 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/settings/migrations_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
index b18403a7f..bc6436b87 100644
--- 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