summaryrefslogtreecommitdiff
path: root/app/helpers/issues_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-15 15:10:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-15 15:10:13 +0000
commit6e2dde590e694c13efdd441e058a925dcff17258 (patch)
tree46b182d8d53b8788f5342d333ac0273d1ca9df75 /app/helpers/issues_helper.rb
parentae27cd3c8824d0d7815ad9ba550ad249f7e298a6 (diff)
downloadgitlab-ce-6e2dde590e694c13efdd441e058a925dcff17258.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 8897d73613c..40e86b4623c 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -221,7 +221,7 @@ module IssuesHelper
can_bulk_update: can?(current_user, :admin_issue, project).to_s,
can_edit: can?(current_user, :admin_project, project).to_s,
can_import_issues: can?(current_user, :import_issues, @project).to_s,
- email: current_user&.notification_email,
+ email: current_user&.notification_email_or_default,
emails_help_page_path: help_page_path('development/emails', anchor: 'email-namespace'),
export_csv_path: export_csv_project_issues_path(project),
has_any_issues: project_issues(project).exists?.to_s,