summaryrefslogtreecommitdiff
path: root/app/models/abuse_report.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-12 13:11:30 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-15 21:09:25 +0100
commit8077a5f9589e365f58f22015819bff7debcd7299 (patch)
tree29ae91d16fdce68d9ae1004cfcd6eb088e72e324 /app/models/abuse_report.rb
parenta09323c9f5df69a60d00278dec64775821751711 (diff)
downloadgitlab-ce-8077a5f9589e365f58f22015819bff7debcd7299.tar.gz
Clearify who deletes the user
Diffstat (limited to 'app/models/abuse_report.rb')
-rw-r--r--app/models/abuse_report.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 155b5f327cb..b61f5123127 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -19,9 +19,9 @@ class AbuseReport < ActiveRecord::Base
validates :message, presence: true
validates :user_id, uniqueness: { message: 'has already been reported' }
- def remove_user(current_user)
+ def remove_user(deleted_by:)
user.block
- DeleteUserWorker.perform_async(current_user.id, user.id, force: true)
+ DeleteUserWorker.perform_async(deleted_by.id, user.id, delete_solo_owned_groups: true)
end
def notify