提交 dc45cc54 编写于 作者: E Eric Eastwood

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
上级 a1cde68d
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册