mirror of
https://github.com/diaspora/diaspora.git
synced 2026-01-09 15:18:11 -05:00
Merge branch 'next-minor' into develop
This commit is contained in:
@@ -31,7 +31,11 @@ module Diaspora
|
||||
profile = profile(entity.profile, opts)
|
||||
return if AccountMigration.exists?(old_person: old_person, new_person: profile.person)
|
||||
|
||||
AccountMigration.create!(old_person: old_person, new_person: profile.person).tap do |migration|
|
||||
AccountMigration.create!(
|
||||
old_person: old_person,
|
||||
new_person: profile.person,
|
||||
remote_photo_path: entity.remote_photo_path
|
||||
).tap do |migration|
|
||||
migration.signature = entity.signature if old_person.local?
|
||||
migration.save!
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user