summaryrefslogtreecommitdiff
path: root/app/services/users
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-11-02 15:51:42 +0100
committerJarka Kadlecova <jarka@gitlab.com>2017-11-06 13:02:50 +0100
commit906d2f03d1260baac52c0050e60fbc2b87f27400 (patch)
tree687c1a5771e140f1601dd5d554d288002b03accd /app/services/users
parentc791d9cf4af0bd23a7b4d263ce32342f41d3dd44 (diff)
downloadgitlab-ce-906d2f03d1260baac52c0050e60fbc2b87f27400.tar.gz
Refactor issuable destroy action
Diffstat (limited to 'app/services/users')
-rw-r--r--app/services/users/migrate_to_ghost_user_service.rb18
1 files changed, 11 insertions, 7 deletions
diff --git a/app/services/users/migrate_to_ghost_user_service.rb b/app/services/users/migrate_to_ghost_user_service.rb
index 3a9c151cf9b..976017dfa82 100644
--- a/app/services/users/migrate_to_ghost_user_service.rb
+++ b/app/services/users/migrate_to_ghost_user_service.rb
@@ -25,7 +25,7 @@ module Users
user.block
# Reverse the user block if record migration fails
- if !migrate_records && transition
+ if !migrate_records_in_transaction && transition
transition.rollback
user.save!
end
@@ -36,18 +36,22 @@ module Users
private
- def migrate_records
+ def migrate_records_in_transaction
user.transaction(requires_new: true) do
@ghost_user = User.ghost
- migrate_issues
- migrate_merge_requests
- migrate_notes
- migrate_abuse_reports
- migrate_award_emojis
+ migrate_records
end
end
+ def migrate_records
+ migrate_issues
+ migrate_merge_requests
+ migrate_notes
+ migrate_abuse_reports
+ migrate_award_emojis
+ end
+
def migrate_issues
user.issues.update_all(author_id: ghost_user.id)
Issue.where(last_edited_by_id: user.id).update_all(last_edited_by_id: ghost_user.id)