diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-06-28 14:08:26 -0800 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2019-06-29 00:22:09 +0800 |
| commit | 1ca5520bd6f3447ada3a1120d2a3bd445ab6746a (patch) | |
| tree | 30de757277f2948f38357fc78b3b1792975394d3 /spec/controllers/projects/branches_controller_spec.rb | |
| parent | ac3de494bde32e4ce13bd665d1de3132b84c002d (diff) | |
| download | gitlab-ce-1ca5520bd6f3447ada3a1120d2a3bd445ab6746a.tar.gz | |
Fix issues when creating system notes58583-confidential-mr-branch-backend
When `confidential_issue_project_id` is set and the issue is
under that project, create the a note about branch creation
in that project. If not, do nothing.
When creating `new_merge_request` system note, set the project
where the MR will be referenced from so it'll be linked to when
the MR is created in another project.
Diffstat (limited to 'spec/controllers/projects/branches_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/branches_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index 8c349b1e988..712c3fa0ffe 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -92,7 +92,7 @@ describe Projects::BranchesController do end it 'posts a system note' do - expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch") + expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch", branch_project: project) post :create, params: { |