diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 15:34:04 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 15:34:04 +0300 |
| commit | 5dc6c8f2d08534281b0e1adf404af0e8642eb407 (patch) | |
| tree | a7af86fd68b1693f2d1441a2cc22a159658ad7f6 /spec/services/ci/create_pipeline_service_spec.rb | |
| parent | e5b88d88fbd3796ba2f56912818231bdfbf0d597 (diff) | |
| parent | c7e8f5c613754a7221d6b2f0b0e154b75c55dd84 (diff) | |
Merge branch 'security-60039' into 'master'
Disallow invalid MR branch name
See merge request gitlab/gitlabhq!3052
Diffstat (limited to 'spec/services/ci/create_pipeline_service_spec.rb')
| -rw-r--r-- | spec/services/ci/create_pipeline_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index 9a3ac75e418..867692d4d64 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -973,7 +973,7 @@ describe Ci::CreatePipelineService do let(:merge_request) do create(:merge_request, source_project: project, - source_branch: ref_name, + source_branch: Gitlab::Git.ref_name(ref_name), target_project: project, target_branch: 'master') end @@ -1004,7 +1004,7 @@ describe Ci::CreatePipelineService do let(:merge_request) do create(:merge_request, source_project: project, - source_branch: ref_name, + source_branch: Gitlab::Git.ref_name(ref_name), target_project: project, target_branch: 'master') end @@ -1033,7 +1033,7 @@ describe Ci::CreatePipelineService do let(:merge_request) do create(:merge_request, source_project: project, - source_branch: ref_name, + source_branch: Gitlab::Git.ref_name(ref_name), target_project: project, target_branch: 'master') end |