diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-07-20 10:10:36 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-07-20 10:10:36 +0000 |
| commit | 001dd56e7bfd04d22f5437569ba8aa60a0317a3e (patch) | |
| tree | a2d0145355c514758c7f5ad8ec873d801ac872e3 /lib | |
| parent | 652b2d0d293ab054925cbd7e23b298ca06db1810 (diff) | |
| parent | 841de9752fb35b7d1a701da8764729ba334c2da5 (diff) | |
| download | gitlab-ce-001dd56e7bfd04d22f5437569ba8aa60a0317a3e.tar.gz | |
Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into 'master'
Implement build stage_id reference migration clean up
Closes #34893
See merge request !12785
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/background_migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb index b0741b1fba7..d3f66877672 100644 --- a/lib/gitlab/background_migration.rb +++ b/lib/gitlab/background_migration.rb @@ -26,7 +26,7 @@ module Gitlab next unless migration_class == steal_class begin - perform(migration_class, migration_args, retries: 3) if job.delete + perform(migration_class, migration_args) if job.delete rescue Exception # rubocop:disable Lint/RescueException BackgroundMigrationWorker # enqueue this migration again .perform_async(migration_class, migration_args) |