diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
| commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
| tree | 2037291f5863105e54e75be056b49f7d62007cae /app/workers | |
| parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
| -rw-r--r-- | app/workers/authorized_projects_worker.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 545e8886d61..49dcc441780 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -856,7 +856,7 @@ :urgency: :high :resource_boundary: :unknown :weight: 2 - :idempotent: + :idempotent: true - :name: background_migration :feature_category: :not_owned :has_external_dependencies: diff --git a/app/workers/authorized_projects_worker.rb b/app/workers/authorized_projects_worker.rb index 17537cdaa26..a35e0320553 100644 --- a/app/workers/authorized_projects_worker.rb +++ b/app/workers/authorized_projects_worker.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AuthorizedProjectsWorker # rubocop:disable Scalability/IdempotentWorker +class AuthorizedProjectsWorker include ApplicationWorker prepend WaitableWorker @@ -8,6 +8,8 @@ class AuthorizedProjectsWorker # rubocop:disable Scalability/IdempotentWorker urgency :high weight 2 + idempotent! + # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the # visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231 # for more details. |