From 1dc90fc455249fb95a47c4abe37c41caeb2ec7da Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Sat, 21 Mar 2015 08:45:28 -0600 Subject: Fix nested task lists When nesting task list items, the parent item is wrapped in a `

` tag. Update the task list parser to handle these paragraph wrappers. --- lib/gitlab/markdown.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index e02e5b9fc3d..f5e8267031c 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -352,11 +352,12 @@ module Gitlab # ActiveSupport::SafeBuffer, hence the `String.new` String.new(text).gsub(Taskable::TASK_PATTERN_HTML) do checked = $LAST_MATCH_INFO[:checked].downcase == 'x' + p_tag = $LAST_MATCH_INFO[:p_tag] if checked - "#{li_tag}#{checked_box}" + "#{li_tag}#{p_tag}#{checked_box}" else - "#{li_tag}#{unchecked_box}" + "#{li_tag}#{p_tag}#{unchecked_box}" end end end -- cgit v1.2.1