diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /spec/lib/gitlab/import | |
parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/import')
-rw-r--r-- | spec/lib/gitlab/import/merge_request_helpers_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import/merge_request_helpers_spec.rb b/spec/lib/gitlab/import/merge_request_helpers_spec.rb index cc0f2baf905..42515888d4f 100644 --- a/spec/lib/gitlab/import/merge_request_helpers_spec.rb +++ b/spec/lib/gitlab/import/merge_request_helpers_spec.rb @@ -18,7 +18,7 @@ describe Gitlab::Import::MergeRequestHelpers, type: :helper do target_project_id: project.id, source_branch: 'master-42', target_branch: 'master', - state: :merged, + state_id: 3, author_id: user.id, assignee_id: user.id } |