diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-11 22:54:35 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2019-01-11 22:54:35 +0000 |
commit | f5dd9107363b7376325712f973339c7fde036ef2 (patch) | |
tree | a9976582038347723ad9c9ec87e71f7fb73b6a19 | |
parent | 8a7f40b1e2719fec7d666cc1b7193a705c7b7faf (diff) | |
parent | 6ca819ce907179bc829eaf3fe710a87ec278e8ec (diff) | |
download | gitlab-ce-f5dd9107363b7376325712f973339c7fde036ef2.tar.gz |
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
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 | ||||
-rw-r--r-- | changelogs/unreleased/37990-task-list-bracket.yml | 5 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | yarn.lock | 8 |
5 files changed, 13 insertions, 8 deletions
@@ -112,7 +112,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing 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 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' diff --git a/Gemfile.lock b/Gemfile.lock index 075aa616215..b4602dbbf36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.0.1) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -974,7 +974,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.0.1) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) diff --git a/changelogs/unreleased/37990-task-list-bracket.yml b/changelogs/unreleased/37990-task-list-bracket.yml new file mode 100644 index 00000000000..ffa77cf0af7 --- /dev/null +++ b/changelogs/unreleased/37990-task-list-bracket.yml @@ -0,0 +1,5 @@ +--- +title: Fix ambiguous brackets in task lists +merge_request: 18514 +author: Jared Deckard <jared.deckard@gmail.com> +type: fixed diff --git a/package.json b/package.json index 8c6fdcbad06..325341f1ca7 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "d3-time": "^1.0.8", "d3-time-format": "^2.1.1", "dateformat": "^3.0.3", - "deckar01-task_list": "^2.0.0", + "deckar01-task_list": "^2.0.1", "diff": "^3.4.0", "document-register-element": "1.3.0", "dropzone": "^4.2.0", diff --git a/yarn.lock b/yarn.lock index 40a8594ee6c..da00f335362 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3034,10 +3034,10 @@ decamelize@^2.0.0: dependencies: xregexp "4.0.0" -deckar01-task_list@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.0.0.tgz#7f7a595430d21b3036ed5dfbf97d6b65de18e2c9" - integrity sha1-f3pZVDDSGzA27V37+X1rZd4Y4sk= +deckar01-task_list@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.0.1.tgz#fdcfb6ab5717055a82f29e863a49990a043a06a9" + integrity sha512-i5fT8QxJ9iV6dfgy5U0NHW91O5cKsvDc4u8JNMnZ6efQc356bA9vKuXO3732agSry+bO6TolzTmuqSRi4tkkeA== decode-uri-component@^0.2.0: version "0.2.0" |