diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-11 21:47:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-11 21:47:20 +0000 |
| commit | b384d4781ada21ebb4bf8c703f59f188823b0ada (patch) | |
| tree | 6fce656cc957fee757ecac1268e31e01542d5ded /app | |
| parent | b5cde6b62efaa97545ebbd334ab96f616a97d326 (diff) | |
| parent | f4319f6a1828993503dc6683b65a5895a5c2fb5b (diff) | |
| download | gitlab-ce-b384d4781ada21ebb4bf8c703f59f188823b0ada.tar.gz | |
Merge branch 'sh-remove-import-retry-count-warning' into 'master'
Remove warning noise in ProjectImportOptions
See merge request gitlab-org/gitlab-ce!16410
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/concerns/project_import_options.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/concerns/project_import_options.rb b/app/workers/concerns/project_import_options.rb index 10b971344f7..ef23990ad97 100644 --- a/app/workers/concerns/project_import_options.rb +++ b/app/workers/concerns/project_import_options.rb @@ -1,9 +1,9 @@ module ProjectImportOptions extend ActiveSupport::Concern - included do - IMPORT_RETRY_COUNT = 5 + IMPORT_RETRY_COUNT = 5 + included do sidekiq_options retry: IMPORT_RETRY_COUNT, status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION # We only want to mark the project as failed once we exhausted all retries |