diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:11:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:11:11 +0000 |
| commit | 6b5937e93e758a429a02eb0644fd23ad164a4ad9 (patch) | |
| tree | 7c4f2cb996078b7a9f5a5dfe3891c4a927a3a835 /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 52d6a520b1dde5b050be56f1bc67110b8f43e6e6 (diff) | |
| download | gitlab-ce-6b5937e93e758a429a02eb0644fd23ad164a4ad9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 36b6df59ef5..d20bb2b16e5 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Projects::MergeRequestsController do let_it_be_with_refind(:project) { create(:project, :repository) } let_it_be_with_reload(:project_public_with_private_builds) { create(:project, :repository, :public, :builds_private) } - let(:user) { project.owner } + let(:user) { project.first_owner } let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: merge_request_source_project, allow_collaboration: false) } let(:merge_request_source_project) { project } |