Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master'

Don't create new pipeline for merge requests with no commits

See merge request gitlab-org/gitlab-ce!24503

2 files changed, 24 insertions, 2 deletions

diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index 4e64b0c9414..b46aa65818d 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -197,6 +197,24 @@ describe MergeRequests::CreateService do
             expect(merge_request.actual_head_pipeline).to be_merge_request
           end
 
+          context 'when there are no commits between source branch and target branch' do
+            let(:opts) do
+              {
+                title: 'Awesome merge_request',
+                description: 'please fix',
+                source_branch: 'not-merged-branch',
+                target_branch: 'master'
+              }
+            end
+
+            it 'does not create a merge request pipeline' do
+              expect(merge_request).to be_persisted
+
+              merge_request.reload
+              expect(merge_request.merge_request_pipelines.count).to eq(0)
+            end
+          end
+
           context "when branch pipeline was created before a merge request pipline has been created" do
             before do
               create(:ci_pipeline, project: merge_request.source_project,
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 1169ed5f9f2..9e9dc5a576c 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -150,11 +150,15 @@ describe MergeRequests::RefreshService do
           }
         end
 
-        it 'create merge request pipeline' do
+        it 'create merge request pipeline with commits' do
           expect { subject }
             .to change { @merge_request.merge_request_pipelines.count }.by(1)
             .and change { @fork_merge_request.merge_request_pipelines.count }.by(1)
-            .and change { @another_merge_request.merge_request_pipelines.count }.by(1)
+            .and change { @another_merge_request.merge_request_pipelines.count }.by(0)
+
+          expect(@merge_request.has_commits?).to be_truthy
+          expect(@fork_merge_request.has_commits?).to be_truthy
+          expect(@another_merge_request.has_commits?).to be_falsy
         end
 
         context "when branch pipeline was created before a merge request pipline has been created" do