From dc45cc54114acd822bdb1ecc8d34c03a8093367b Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 22 Mar 2018 18:12:15 -0500 Subject: [PATCH] Fix unapproved unassigned MR email erroring out Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092 Conflicts: ee/app/views/notify/unapproved_merge_request_email.html.haml spec/mailers/notify_spec.rb --- spec/mailers/previews/notify_preview.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/mailers/previews/notify_preview.rb b/spec/mailers/previews/notify_preview.rb index 580f0d56a92..43c3c89f140 100644 --- a/spec/mailers/previews/notify_preview.rb +++ b/spec/mailers/previews/notify_preview.rb @@ -65,7 +65,7 @@ class NotifyPreview < ActionMailer::Preview end def merge_request - @merge_request ||= project.merge_requests.find_by(source_branch: 'master', target_branch: 'feature') + @merge_request ||= project.merge_requests.first end def user