diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/services/projects/propagate_service_template.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/services/projects/propagate_service_template.rb')
-rw-r--r-- | app/services/projects/propagate_service_template.rb | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/app/services/projects/propagate_service_template.rb b/app/services/projects/propagate_service_template.rb index 4adcda042d1..b6465810fde 100644 --- a/app/services/projects/propagate_service_template.rb +++ b/app/services/projects/propagate_service_template.rb @@ -26,7 +26,7 @@ module Projects def propagate_projects_with_template loop do - batch = Project.uncached { project_ids_without_integration } + batch = Project.uncached { Project.ids_without_integration(template, BATCH_SIZE) } bulk_create_from_template(batch) unless batch.empty? @@ -50,22 +50,6 @@ module Projects end end - # rubocop: disable CodeReuse/ActiveRecord - def project_ids_without_integration - services = Service - .select('1') - .where('services.project_id = projects.id') - .where(type: template.type) - - Project - .where('NOT EXISTS (?)', services) - .where(pending_delete: false) - .where(archived: false) - .limit(BATCH_SIZE) - .pluck(:id) - end - # rubocop: enable CodeReuse/ActiveRecord - def bulk_insert(klass, columns, values_array) items_to_insert = values_array.map { |array| Hash[columns.zip(array)] } |