Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-18 03:09:18 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-18 03:09:18 +0300
commita1565a8243dd2cce29d0489d5ed40f9291d828d4 (patch)
treeed32d41117be241062ce5fd6a9576ed8a99fcffc /lib/banzai
parent40254b9ace2a74a3c9f1cc51a1b1d5e3e78c1ae9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
-rw-r--r--lib/banzai/filter/abstract_reference_filter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
index 7f986bccc99..5962403d488 100644
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -297,8 +297,8 @@ module Banzai
@references_per[parent_type] ||= begin
refs = Hash.new { |hash, key| hash[key] = Set.new }
regex = [
- object_class.reference_pattern,
- object_class.link_reference_pattern
+ object_class.link_reference_pattern,
+ object_class.reference_pattern
].compact.reduce { |a, b| Regexp.union(a, b) }
nodes.each do |node|