diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-22 13:18:15 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-22 13:18:15 -0400 |
| commit | fb5116caa2945d7b0bba317274d58911b2497711 (patch) | |
| tree | cf625771b61f72e20e40770a38bacebad4dff780 | |
| parent | b5ee60c51263c981098d3268a8cb7105376651fa (diff) | |
| download | gitlab-ce-rs-search_text_nodes.tar.gz | |
Use `search_text_nodes` helper in our custom filtersrs-search_text_nodes
Closes #1477
| -rw-r--r-- | lib/gitlab/markdown/emoji_filter.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/markdown/reference_filter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/markdown/emoji_filter.rb b/lib/gitlab/markdown/emoji_filter.rb index e239f766844..6794ab9c897 100644 --- a/lib/gitlab/markdown/emoji_filter.rb +++ b/lib/gitlab/markdown/emoji_filter.rb @@ -15,7 +15,7 @@ module Gitlab IGNORED_ANCESTOR_TAGS = %w(pre code tt).to_set def call - doc.search('text()').each do |node| + search_text_nodes(doc).each do |node| content = node.to_html next unless content.include?(':') next if has_ancestor?(node, IGNORED_ANCESTOR_TAGS) diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb index 26663c8d990..ef4aa408a7e 100644 --- a/lib/gitlab/markdown/reference_filter.rb +++ b/lib/gitlab/markdown/reference_filter.rb @@ -49,7 +49,7 @@ module Gitlab def replace_text_nodes_matching(pattern) return doc if project.nil? - doc.search('text()').each do |node| + search_text_nodes(doc).each do |node| content = node.to_html next unless content.match(pattern) |