Merge branch '22466-task-list-fork' into 'master'
Resolve "Task List Checkbox Alignment" ## What does this MR do? Replace the unmaintained `task_list` gem with the `deckar01-task_list` fork ## Are there points in the code the reviewer needs to double check? - I had to pin some dependencies in the fork to support `ruby < 2.2`, which added new version restrictions for 2 existing modules. - I triggered a build after I removed the patch to show the test passed with the new gem, then I removed the test, because this behavior is tested in the gem's repo now. ## Why was this MR needed? - The `task_list` patch was added with a comment that said it should be removed when merged upstream, but the repo got archived, so an upstream patch requires a fork. - #22470 can't be patched without warnings due to the way `task_list` uses Ruby constants. - There are additional outstanding `task_list` bugs that can be fixed once we switch to a fork. ## What are the relevant issue numbers? - #22466 - #22470 - !6487 See merge request !6625
Showing
... | @@ -99,17 +99,17 @@ gem 'unf', '~> 0.1.4' | ... | @@ -99,17 +99,17 @@ gem 'unf', '~> 0.1.4' |
gem 'seed-fu', '~> 2.3.5' | gem 'seed-fu', '~> 2.3.5' | ||
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | gem 'html-pipeline', '~> 1.11.0' | ||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' | gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' | ||
gem 'github-markup', '~> 1.4' | gem 'github-markup', '~> 1.4' | ||
gem 'redcarpet', '~> 3.3.3' | gem 'redcarpet', '~> 3.3.3' | ||
gem 'RedCloth', '~> 4.3.2' | gem 'RedCloth', '~> 4.3.2' | ||
gem 'rdoc', '~>3.6' | gem 'rdoc', '~>3.6' | ||
gem 'org-ruby', '~> 0.9.12' | gem 'org-ruby', '~> 0.9.12' | ||
gem 'creole', '~> 0.5.0' | gem 'creole', '~> 0.5.0' | ||
gem 'wikicloth', '0.8.1' | gem 'wikicloth', '0.8.1' | ||
gem 'asciidoctor', '~> 1.5.2' | gem 'asciidoctor', '~> 1.5.2' | ||
gem 'rouge', '~> 2.0' | gem 'rouge', '~> 2.0' | ||
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s | # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s | ||
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM | # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM | ||
... | ... |
Please register or sign in to comment