diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 00:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 00:10:15 +0300 |
| commit | 0790cf032c70b3df250e1953a3a11b71d835c5a1 (patch) | |
| tree | ca31b07a5623da26df1fa0323832c7896b5e3386 /app/workers/merge_worker.rb | |
| parent | 37419c44f04cd802ac89fe2d54b8501a0718a5e3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/merge_worker.rb')
| -rw-r--r-- | app/workers/merge_worker.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb index fbebaa925b4..270bd831f96 100644 --- a/app/workers/merge_worker.rb +++ b/app/workers/merge_worker.rb @@ -7,7 +7,6 @@ class MergeWorker # rubocop:disable Scalability/IdempotentWorker urgency :high weight 5 loggable_arguments 2 - idempotent! def perform(merge_request_id, current_user_id, params) params = params.with_indifferent_access |