Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-23 00:09:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-23 00:09:53 +0300
commitd6d1051383d42211e5f4d2752d60f946f21df1b7 (patch)
treee9f8a0c60c17ebc26a96e5349656d12d9aeb2a7f /app/mailers
parent0a5e00b6914944295b31ce10ffd5429cbe9fae89 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/previews/notify_preview.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index 5fda60a7408..f6b1e503cb5 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -88,6 +88,10 @@ class NotifyPreview < ActionMailer::Preview
Notify.issues_csv_email(user, project, '1997,Ford,E350', { truncated: false, rows_expected: 3, rows_written: 3 }).message
end
+ def new_issue_email
+ Notify.new_issue_email(user.id, issue.id).message
+ end
+
def new_merge_request_email
Notify.new_merge_request_email(user.id, merge_request.id).message
end
@@ -200,7 +204,7 @@ class NotifyPreview < ActionMailer::Preview
end
def issue
- @merge_request ||= project.issues.first
+ @issue ||= project.issues.first
end
def merge_request