diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 21:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 21:08:01 +0300 |
| commit | 5eb11b697d7ee280b0b5c2ff9a1850a3b5e9b7e3 (patch) | |
| tree | 78f8dceccd65aec28bb4cb130cac3ff7e3a75c87 /spec/lib/gitlab/import | |
| parent | 506159637da758f448818b834f8482238a9eb4eb (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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/lib/gitlab/import/merge_request_helpers_spec.rb b/spec/lib/gitlab/import/merge_request_helpers_spec.rb index 42515888d4f..2b165994152 100644 --- a/spec/lib/gitlab/import/merge_request_helpers_spec.rb +++ b/spec/lib/gitlab/import/merge_request_helpers_spec.rb @@ -19,8 +19,7 @@ describe Gitlab::Import::MergeRequestHelpers, type: :helper do source_branch: 'master-42', target_branch: 'master', state_id: 3, - author_id: user.id, - assignee_id: user.id + author_id: user.id } end |