diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:27:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:27:36 +0000 |
| commit | 67996c1e03e93b54a5925169fcc973814e82c61c (patch) | |
| tree | e6335cc728dbcea8a246d33ba98e9ae67b4e33a8 | |
| parent | 1c96b0b9bf01b8044082ce078a74aef66162053b (diff) | |
| parent | fb5116caa2945d7b0bba317274d58911b2497711 (diff) | |
| download | gitlab-ce-67996c1e03e93b54a5925169fcc973814e82c61c.tar.gz | |
Merge branch 'rs-search_text_nodes' into 'master'
Use `search_text_nodes` helper in our custom filters
Closes #1477
See merge request !561
| -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) |