diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:33:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:33:01 +0000 |
| commit | 285ae60c15c913aa6145554ecbddf9b966ebd0e7 (patch) | |
| tree | 253a50de841b90483569209ce0596d5b20e5f96d /app | |
| parent | 67996c1e03e93b54a5925169fcc973814e82c61c (diff) | |
| parent | 51ad59e0d880de4633d18af583be015af229b97d (diff) | |
| download | gitlab-ce-285ae60c15c913aa6145554ecbddf9b966ebd0e7.tar.gz | |
Merge branch 'issue-body-code-mentions' into 'master'
Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254.
See merge request !553
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/mentionable.rb | 2 |
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. |