Merge branch...
Merge branch 'ee-19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master' EE port of task list improvements MR See merge request gitlab-org/gitlab-ee!9365
Showing
... | @@ -123,7 +123,7 @@ gem 'faraday_middleware-aws-signers-v4' | ... | @@ -123,7 +123,7 @@ gem 'faraday_middleware-aws-signers-v4' |
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 2.8' | gem 'html-pipeline', '~> 2.8' | ||
gem 'deckar01-task_list', '2.0.1' | gem 'deckar01-task_list', '2.2.0' | ||
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' | ||
... | ... |
... | @@ -58,7 +58,7 @@ | ... | @@ -58,7 +58,7 @@ |
"d3-time-format": "^2.1.1", | "d3-time-format": "^2.1.1", | ||
"d3-transition": "^1.1.1", | "d3-transition": "^1.1.1", | ||
"dateformat": "^3.0.3", | "dateformat": "^3.0.3", | ||
"deckar01-task_list": "^2.0.1", | "deckar01-task_list": "^2.2.0", | ||
"diff": "^3.4.0", | "diff": "^3.4.0", | ||
"document-register-element": "1.3.0", | "document-register-element": "1.3.0", | ||
"dropzone": "^4.2.0", | "dropzone": "^4.2.0", | ||
... | ... |
This diff is collapsed.
Please register or sign in to comment