summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 06:09:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 06:09:43 +0000
commit213da19cda5309148952ab770e2a9e122fe32e22 (patch)
tree80a48af510839497fa83625a34530543d255a957 /app/models/concerns
parent3591ecba91126089ebf916f9bd95fe497609920c (diff)
downloadgitlab-ce-213da19cda5309148952ab770e2a9e122fe32e22.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/noteable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb
index 0333cfc5f9e..65e7f734233 100644
--- a/app/models/concerns/noteable.rb
+++ b/app/models/concerns/noteable.rb
@@ -198,7 +198,7 @@ module Noteable
def creatable_note_email_address(author)
return unless supports_creating_notes_by_email?
- project_email = project.new_issuable_address(author, self.class.name.underscore)
+ project_email = project&.new_issuable_address(author, base_class_name.underscore)
return unless project_email
project_email.sub('@', "-#{iid}@")