summaryrefslogtreecommitdiff
path: root/spec/features/dashboard/merge_requests_spec.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-04-09 15:19:36 +0000
committerNick Thomas <nick@gitlab.com>2019-04-09 15:19:36 +0000
commita6218f1bcd78f656d57330e764d3f98e1fb1f3f3 (patch)
tree175697ffe45795f36bcb0ceded2affe40069ee00 /spec/features/dashboard/merge_requests_spec.rb
parent12e35b49576beed0519d1c52aa6fb592d7c59fc7 (diff)
parentca884980ee8e6fe1269f5abdb803519d51aa09c0 (diff)
downloadgitlab-ce-a6218f1bcd78f656d57330e764d3f98e1fb1f3f3.tar.gz
Merge branch 'osw-multi-assignees-merge-requests' into 'master'
[Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
Diffstat (limited to 'spec/features/dashboard/merge_requests_spec.rb')
-rw-r--r--spec/features/dashboard/merge_requests_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index 4965770605a..0c6713f623c 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -48,14 +48,14 @@ describe 'Dashboard Merge Requests' do
let!(:assigned_merge_request) do
create(:merge_request,
- assignee: current_user,
+ assignees: [current_user],
source_project: project,
author: create(:user))
end
let!(:assigned_merge_request_from_fork) do
create(:merge_request,
- source_branch: 'markdown', assignee: current_user,
+ source_branch: 'markdown', assignees: [current_user],
target_project: public_project, source_project: forked_project,
author: create(:user))
end