diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-17 15:56:44 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-17 15:56:44 +0200 |
| commit | 5b1db58c852d6b36b91a61ec66e2f3cb5187f3a2 (patch) | |
| tree | 17d90632a853b6ff92a04a44ae156557da813a49 /app/models/abuse_report.rb | |
| parent | a6f5304280d95c496b7669d1553cc6c246f11f94 (diff) | |
| parent | 4171933c0963696626c879c2d05afa1594a71d99 (diff) | |
| download | gitlab-ce-5b1db58c852d6b36b91a61ec66e2f3cb5187f3a2.tar.gz | |
Merge branch 'master' into rm_duplicate_cache_ci_docs
Diffstat (limited to 'app/models/abuse_report.rb')
| -rw-r--r-- | app/models/abuse_report.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb index cc59aa4e911..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 + def remove_user(deleted_by:) user.block - user.destroy + DeleteUserWorker.perform_async(deleted_by.id, user.id, delete_solo_owned_groups: true) end def notify |