diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-07-13 17:48:15 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-13 17:48:15 +0300 |
commit | 6717643c30541a95eeb99202861c43eca7ffd9b4 (patch) | |
tree | 87d86e5d76dd4a0f3d2e00ee9bf8aa17f052674e /spec/support | |
parent | 16b867d8ce6246ad849642d9f3a5cc505b312a5a (diff) | |
parent | 9b9cbb4a1a046d4aa04af94373216fa8fdba79db (diff) |
Merge branch 'ide-merge-requests-forks' into 'master'
Allow merge requests from forks to be opened in Web IDE
Closes #47460
See merge request gitlab-org/gitlab-ce!20521
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/shared_contexts/merge_requests_allowing_collaboration.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/support/shared_contexts/merge_requests_allowing_collaboration.rb b/spec/support/shared_contexts/merge_requests_allowing_collaboration.rb new file mode 100644 index 00000000000..05424d08b9d --- /dev/null +++ b/spec/support/shared_contexts/merge_requests_allowing_collaboration.rb @@ -0,0 +1,15 @@ +shared_context 'merge request allowing collaboration' do + include ProjectForksHelper + + let(:canonical) { create(:project, :public, :repository) } + let(:forked_project) { fork_project(canonical, nil, repository: true) } + + before do + canonical.add_maintainer(user) + create(:merge_request, + target_project: canonical, + source_project: forked_project, + source_branch: 'feature', + allow_collaboration: true) + end +end |