diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-03-22 18:12:15 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-28 10:34:12 -0500 |
| commit | dc45cc54114acd822bdb1ecc8d34c03a8093367b (patch) | |
| tree | 347cbb804dc7c84923e954d6ed604494da5a269a | |
| parent | a1cde68d208437a470267e28ccff66fe8be88c2e (diff) | |
| download | gitlab-ce-ce-3092-fix-unassigned-unapproved-mr-email-failing.tar.gz | |
Fix unapproved unassigned MR email erroring outce-3092-fix-unassigned-unapproved-mr-email-failing
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
| -rw-r--r-- | spec/mailers/previews/notify_preview.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |