diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-12 21:12:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-12 21:12:15 +0300 |
| commit | da59ce8b217f67707b391d9fb3503dbdf8c4e511 (patch) | |
| tree | 6839f806745e333f25ddb29317aead689cced15b /lib | |
| parent | 3df6bfc24c8877b9442d567378b8ebd8816cd443 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/background_migration/move_container_registry_enabled_to_project_feature.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/pipeline/process.rb | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/background_migration/move_container_registry_enabled_to_project_feature.rb b/lib/gitlab/background_migration/move_container_registry_enabled_to_project_feature.rb index 4eaef26c9c6..9ecf53317d0 100644 --- a/lib/gitlab/background_migration/move_container_registry_enabled_to_project_feature.rb +++ b/lib/gitlab/background_migration/move_container_registry_enabled_to_project_feature.rb @@ -6,7 +6,7 @@ module Gitlab # project_features.container_registry_access_level for the projects within # the given range of ids. class MoveContainerRegistryEnabledToProjectFeature - MAX_BATCH_SIZE = 1_000 + MAX_BATCH_SIZE = 300 module Migratable # Migration model namespace isolated from application code. diff --git a/lib/gitlab/ci/pipeline/chain/pipeline/process.rb b/lib/gitlab/ci/pipeline/chain/pipeline/process.rb index 73d5e2cc1c4..c1b6dfb7e36 100644 --- a/lib/gitlab/ci/pipeline/chain/pipeline/process.rb +++ b/lib/gitlab/ci/pipeline/chain/pipeline/process.rb @@ -8,11 +8,7 @@ module Gitlab # After pipeline has been successfully created we can start processing it. class Process < Chain::Base def perform! - if ::Feature.enabled?(:ci_async_initial_pipeline_processing, project, default_enabled: :yaml) - ::Ci::InitialPipelineProcessWorker.perform_async(pipeline.id) - else - ::Ci::ProcessPipelineService.new(pipeline).execute - end + ::Ci::InitialPipelineProcessWorker.perform_async(pipeline.id) end def break? |