diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-29 08:53:12 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-29 08:53:12 +0000 |
| commit | 89a3572bfe15c5a627c7f5646a997179e686ee27 (patch) | |
| tree | 602f20ad4c3bb66a16cd5dfe1a8c488cfbb6204a | |
| parent | 857f4ef731926bdf705625dd35b2563f72efcba6 (diff) | |
| parent | dc45cc54114acd822bdb1ecc8d34c03a8093367b (diff) | |
| download | gitlab-ce-89a3572bfe15c5a627c7f5646a997179e686ee27.tar.gz | |
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
| -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 |