summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-05-09 12:31:05 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-05-09 12:31:05 +0000
commit387b44103c168d9a1b82997101deb60c61b6aaf1 (patch)
tree027d2988de9f36824a53a60b1101422337515324
parenteb61b3b3aad9ff34d095a6ed2b5eda76170bef4f (diff)
parent69b10e1695bd68b570bc9993777b0d1446e85a57 (diff)
downloadgitlab-ce-387b44103c168d9a1b82997101deb60c61b6aaf1.tar.gz
Merge branch 'tc-fix-snippets-notes-spec' into 'master'
Fix spec/features/snippets/notes_on_personal_snippets_spec.rb Closes #31993 See merge request !11199
-rw-r--r--app/models/concerns/mentionable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 5ac56ac6fa0..6eddeab515e 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -92,7 +92,7 @@ module Mentionable
# Uses regex to quickly determine if mentionables might be referenced
# Allows heavy processing to be skipped
def matches_cross_reference_regex?
- reference_pattern = if project.default_issues_tracker?
+ reference_pattern = if !project || project.default_issues_tracker?
ReferenceRegexes::DEFAULT_PATTERN
else
ReferenceRegexes::EXTERNAL_PATTERN