Commit 89a3572b authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ce-3092-fix-unassigned-unapproved-mr-email-failing' into 'master'

Fix unapproved unassigned merge request e-mails failing -- CE backport

Closes gitlab-ee#3092

See merge request gitlab-org/gitlab-ce!18007
parents 857f4ef7 dc45cc54
...@@ -65,7 +65,7 @@ class NotifyPreview < ActionMailer::Preview ...@@ -65,7 +65,7 @@ class NotifyPreview < ActionMailer::Preview
end end
def merge_request def merge_request
@merge_request ||= project.merge_requests.find_by(source_branch: 'master', target_branch: 'feature') @merge_request ||= project.merge_requests.first
end end
def user def user
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment