summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-06 09:09:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-06 09:09:03 +0000
commit61ee5c363522f2639d1c515a74b9b02b7672c7c2 (patch)
tree65905860063ad3af3c31656b6aa1ca6f8fe36856 /spec/controllers/projects/merge_requests_controller_spec.rb
parent5e230e10b86a9b65eb5a7aa532879fe7456003e6 (diff)
downloadgitlab-ce-61ee5c363522f2639d1c515a74b9b02b7672c7c2.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.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index d452f69d6fb..6644373f758 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -8,6 +8,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(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }