Commit f5dd9107 authored by Clement Ho's avatar Clement Ho

Merge branch '37990-task-list-bracket' into 'master'

Allow brackets in task lists

Closes #56083, #45599, and #37990

See merge request gitlab-org/gitlab-ce!18514
parents 8a7f40b1 6ca819ce
...@@ -112,7 +112,7 @@ gem 'seed-fu', '~> 2.3.7' ...@@ -112,7 +112,7 @@ gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0.0' gem 'deckar01-task_list', '2.0.1'
gem 'gitlab-markup', '~> 1.6.5' gem 'gitlab-markup', '~> 1.6.5'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'redcarpet', '~> 3.4' gem 'redcarpet', '~> 3.4'
......
...@@ -143,7 +143,7 @@ GEM ...@@ -143,7 +143,7 @@ GEM
database_cleaner (1.7.0) database_cleaner (1.7.0)
debug_inspector (0.0.3) debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8) debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.0.0) deckar01-task_list (2.0.1)
html-pipeline html-pipeline
declarative (0.0.10) declarative (0.0.10)
declarative-option (0.1.0) declarative-option (0.1.0)
...@@ -974,7 +974,7 @@ DEPENDENCIES ...@@ -974,7 +974,7 @@ DEPENDENCIES
connection_pool (~> 2.0) connection_pool (~> 2.0)
creole (~> 0.5.0) creole (~> 0.5.0)
database_cleaner (~> 1.7.0) database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.0.0) deckar01-task_list (= 2.0.1)
device_detector device_detector
devise (~> 4.4) devise (~> 4.4)
devise-two-factor (~> 3.0.0) devise-two-factor (~> 3.0.0)
......
---
title: Fix ambiguous brackets in task lists
merge_request: 18514
author: Jared Deckard <jared.deckard@gmail.com>
type: fixed
...@@ -3034,10 +3034,10 @@ decamelize@^2.0.0: ...@@ -3034,10 +3034,10 @@ decamelize@^2.0.0:
dependencies: dependencies:
xregexp "4.0.0" xregexp "4.0.0"
deckar01-task_list@^2.0.0: deckar01-task_list@^2.0.1:
version "2.0.0" version "2.0.1"
resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.0.0.tgz#7f7a595430d21b3036ed5dfbf97d6b65de18e2c9" resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.0.1.tgz#fdcfb6ab5717055a82f29e863a49990a043a06a9"
integrity sha1-f3pZVDDSGzA27V37+X1rZd4Y4sk= integrity sha512-i5fT8QxJ9iV6dfgy5U0NHW91O5cKsvDc4u8JNMnZ6efQc356bA9vKuXO3732agSry+bO6TolzTmuqSRi4tkkeA==
decode-uri-component@^0.2.0: decode-uri-component@^0.2.0:
version "0.2.0" version "0.2.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment