diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/workers/delete_diff_files_worker.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/workers/delete_diff_files_worker.rb')
| -rw-r--r-- | app/workers/delete_diff_files_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/delete_diff_files_worker.rb b/app/workers/delete_diff_files_worker.rb index a6759a9d7c4..a31cf650b83 100644 --- a/app/workers/delete_diff_files_worker.rb +++ b/app/workers/delete_diff_files_worker.rb @@ -12,11 +12,11 @@ class DeleteDiffFilesWorker # rubocop:disable Scalability/IdempotentWorker return if merge_request_diff.without_files? MergeRequestDiff.transaction do - merge_request_diff.clean! - MergeRequestDiffFile .where(merge_request_diff_id: merge_request_diff.id) .delete_all + + merge_request_diff.clean! end end # rubocop: enable CodeReuse/ActiveRecord |