summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/create_service_spec.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-03-28 15:55:35 +0700
committerShinya Maeda <shinya@gitlab.com>2019-04-04 10:32:59 +0700
commit57f114566ad2ebd8c7a5c33497740de47a1d3f8b (patch)
treeaf0841456747b081a95a14c246fc7ab9741e53f0 /spec/services/merge_requests/create_service_spec.rb
parent74ace2a445a44a13bd22c1907b8ec55b1772d403 (diff)
downloadgitlab-ce-57f114566ad2ebd8c7a5c33497740de47a1d3f8b.tar.gz
Backport attached merge request pipelinescreate-merge-pipelines-ce
Backport changes to CE
Diffstat (limited to 'spec/services/merge_requests/create_service_spec.rb')
-rw-r--r--spec/services/merge_requests/create_service_spec.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index 55e7b46248b..dc5d1cf2f04 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -263,19 +263,6 @@ describe MergeRequests::CreateService do
expect(merge_request.actual_head_pipeline).to be_merge_request_event
end
end
-
- context "when the 'ci_merge_request_pipeline' feature flag is disabled" do
- before do
- stub_feature_flags(ci_merge_request_pipeline: false)
- end
-
- it 'does not create a detached 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
end
context "when .gitlab-ci.yml does not have merge_requests keywords" do