summaryrefslogtreecommitdiff
path: root/lib/gitlab/reference_extractor.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 /lib/gitlab/reference_extractor.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 'lib/gitlab/reference_extractor.rb')
-rw-r--r--lib/gitlab/reference_extractor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index a502a8fe9cd..634f70347b5 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -18,8 +18,8 @@ module Gitlab
text = text.dup
# Remove preformatted/code blocks so that references are not included
- text.gsub!(%r{<pre>.*?</pre>|<code>.*?</code>}m) { |match| '' }
- text.gsub!(%r{^```.*?^```}m) { |match| '' }
+ text.gsub!(/^```.*?^```/m, '')
+ text.gsub!(/[^`]`[^`]*?`[^`]/, '')
@references = Hash.new { |hash, type| hash[type] = [] }
parse_references(text)