summaryrefslogtreecommitdiff
path: root/app/models/concerns/mentionable.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-21 11:45:03 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-21 14:58:18 +0200
commit51ad59e0d880de4633d18af583be015af229b97d (patch)
tree12354107f31c6db79790bf3cb3803b26bbce8cd8 /app/models/concerns/mentionable.rb
parent76aade28e25d1f6e8924b35ed9bd365c8889987f (diff)
downloadgitlab-ce-51ad59e0d880de4633d18af583be015af229b97d.tar.gz
Fix bug causing `@whatever` inside code blocks to sometimes be picked up as a user mention.issue-body-code-mentions
Diffstat (limited to 'app/models/concerns/mentionable.rb')
-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 acd9a1edc48..aad5e514793 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -28,7 +28,7 @@ module Mentionable
# Construct a String that contains possible GFM references.
def mentionable_text
- self.class.mentionable_attrs.map { |attr| send(attr) || '' }.join
+ self.class.mentionable_attrs.map { |attr| send(attr) }.compact.join("\n\n")
end
# The GFM reference to this Mentionable, which shouldn't be included in its #references.