kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix unapproved unassigned MR email erroring out

Browse source 
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
This commit is contained in:
Eric Eastwood 2018-03-22 18:12:15 -05:00
parent a1cde68d20
commit dc45cc5411
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/mailers/previews/notify_preview.rb
View file

@ -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