Add latest changes from gitlab-org/gitlab@master

2 files changed, 31 insertions, 29 deletions

diff --git a/app/services/ci/external_pull_requests/create_pipeline_service.rb b/app/services/ci/external_pull_requests/create_pipeline_service.rb
new file mode 100644
index 00000000000..78be94bfb41
--- /dev/null
+++ b/app/services/ci/external_pull_requests/create_pipeline_service.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# This service is responsible for creating a pipeline for a given
+# ExternalPullRequest coming from other providers such as GitHub.
+
+module Ci
+  module ExternalPullRequests
+    class CreatePipelineService < BaseService
+      def execute(pull_request)
+        return unless pull_request.open? && pull_request.actual_branch_head?
+
+        create_pipeline_for(pull_request)
+      end
+
+      private
+
+      def create_pipeline_for(pull_request)
+        Ci::CreatePipelineService.new(project, current_user, create_params(pull_request))
+          .execute(:external_pull_request_event, external_pull_request: pull_request)
+      end
+
+      def create_params(pull_request)
+        {
+          ref: pull_request.source_ref,
+          source_sha: pull_request.source_sha,
+          target_sha: pull_request.target_sha
+        }
+      end
+    end
+  end
+end
diff --git a/app/services/external_pull_requests/create_pipeline_service.rb b/app/services/external_pull_requests/create_pipeline_service.rb
deleted file mode 100644
index 36411465ff1..00000000000
--- a/app/services/external_pull_requests/create_pipeline_service.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# This service is responsible for creating a pipeline for a given
-# ExternalPullRequest coming from other providers such as GitHub.
-
-module ExternalPullRequests
-  class CreatePipelineService < BaseService
-    def execute(pull_request)
-      return unless pull_request.open? && pull_request.actual_branch_head?
-
-      create_pipeline_for(pull_request)
-    end
-
-    private
-
-    def create_pipeline_for(pull_request)
-      Ci::CreatePipelineService.new(project, current_user, create_params(pull_request))
-        .execute(:external_pull_request_event, external_pull_request: pull_request)
-    end
-
-    def create_params(pull_request)
-      {
-        ref: pull_request.source_ref,
-        source_sha: pull_request.source_sha,
-        target_sha: pull_request.target_sha
-      }
-    end
-  end
-end