Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 10 deletions

diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index 71dfc1a676c..207b4b5ff8b 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -11,10 +11,10 @@ module Gitlab
           def perform!
             logger.instrument_with_sql(:pipeline_save) do
               BulkInsertableAssociations.with_bulk_insert do
-                with_bulk_insert_tags do
+                ::Ci::BulkInsertableTags.with_bulk_insert_tags do
                   pipeline.transaction do
                     pipeline.save!
-                    CommitStatus.bulk_insert_tags!(statuses)
+                    Gitlab::Ci::Tags::BulkInsert.bulk_insert_tags!(statuses)
                   end
                 end
               end
@@ -29,14 +29,6 @@ module Gitlab
 
           private
 
-          def with_bulk_insert_tags
-            previous = Thread.current['ci_bulk_insert_tags']
-            Thread.current['ci_bulk_insert_tags'] = true
-            yield
-          ensure
-            Thread.current['ci_bulk_insert_tags'] = previous
-          end
-
           def statuses
             strong_memoize(:statuses) do
               pipeline