diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 12:34:04 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 12:34:04 +0000 |
commit | 5dc6c8f2d08534281b0e1adf404af0e8642eb407 (patch) | |
tree | a7af86fd68b1693f2d1441a2cc22a159658ad7f6 /spec/features/issuables | |
parent | e5b88d88fbd3796ba2f56912818231bdfbf0d597 (diff) | |
parent | c7e8f5c613754a7221d6b2f0b0e154b75c55dd84 (diff) | |
download | gitlab-ce-5dc6c8f2d08534281b0e1adf404af0e8642eb407.tar.gz |
Merge branch 'security-60039' into 'master'
Disallow invalid MR branch name
See merge request gitlab/gitlabhq!3052
Diffstat (limited to 'spec/features/issuables')
-rw-r--r-- | spec/features/issuables/issuable_list_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb index 7b6e9cd66b2..225b858742d 100644 --- a/spec/features/issuables/issuable_list_spec.rb +++ b/spec/features/issuables/issuable_list_spec.rb @@ -76,7 +76,7 @@ describe 'issuable list' do create(:issue, project: project, author: user) else create(:merge_request, source_project: project, source_branch: generate(:branch)) - source_branch = FFaker::Name.name + source_branch = FFaker::Lorem.characters(8) pipeline = create(:ci_empty_pipeline, project: project, ref: source_branch, status: %w(running failed success).sample, sha: 'any') create(:merge_request, title: FFaker::Lorem.sentence, source_project: project, source_branch: source_branch, head_pipeline: pipeline) end |