diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
| commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
| tree | 1ee49dd3dbcef7867ad93f875262951612815851 /app/controllers/settings/migrations_controller.rb | |
| parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
| parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'app/controllers/settings/migrations_controller.rb')
| -rw-r--r-- | app/controllers/settings/migrations_controller.rb | 3 |
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 |