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

Merge branch 'ce-3092-fix-unassigned-unapproved-mr-email-failing' into 'master'
89a3572b · Sean McGivern · 857f4ef7 · dc45cc54 · 89a3572b
Commit 89a3572b authored Mar 29, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

notify_preview.rb spec/mailers/previews/notify_preview.rb +1 -1

No files found.
--- 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