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/lib/gitlab/bitbucket_import | |
| 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/lib/gitlab/bitbucket_import')
| -rw-r--r-- | spec/lib/gitlab/bitbucket_import/importer_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb index a02c00e3340..2e90f6c7f71 100644 --- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb +++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb @@ -5,6 +5,7 @@ describe Gitlab::BitbucketImport::Importer do before do stub_omniauth_provider('bitbucket') + stub_feature_flags(stricter_mr_branch_name: false) end let(:statuses) do |