summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-16 16:15:50 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-04-17 14:23:46 +0800
commitc2e9435dde15ca9dd4624bfb5d5ed56b5741f0c2 (patch)
tree60886bcf28ed37afa7368ea580447fc15cb0b86f /lib
parent06afe8b48ee2c2517ecc889a3bf439fe75322380 (diff)
downloadgitlab-ce-c2e9435dde15ca9dd4624bfb5d5ed56b5741f0c2.tar.gz
Merge branch 'sh-fix-base-parser' into 'master'
Fix regression in rendering Markdown references that do not exist Closes #30972 See merge request !10716
Diffstat (limited to 'lib')
-rw-r--r--lib/banzai/reference_parser/base_parser.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb
index dabf71d6aeb..c2503fa2adc 100644
--- a/lib/banzai/reference_parser/base_parser.rb
+++ b/lib/banzai/reference_parser/base_parser.rb
@@ -136,7 +136,8 @@ module Banzai
nodes.each_with_object({}) do |node, hash|
if node.has_attribute?(attribute)
- hash[node] = objects_by_id[node.attr(attribute).to_i]
+ obj = objects_by_id[node.attr(attribute).to_i]
+ hash[node] = obj if obj
end
end
end