diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-03 14:18:02 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-03 14:18:02 +0000 |
commit | c4a061a23e6a379fde8b2d8ecda6d124b22164c6 (patch) | |
tree | d432f0553e7f8a4cd1f58cbcafdb3c1afc04081a /spec/lib | |
parent | dfb9cab828a11cf00522734d11c2472e8b540b5c (diff) | |
parent | 4a23d7f49150c9292f643b6f1c4fdb3494868de7 (diff) | |
download | gitlab-ce-c4a061a23e6a379fde8b2d8ecda6d124b22164c6.tar.gz |
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
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/banzai/filter/task_list_filter_spec.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/spec/lib/banzai/filter/task_list_filter_spec.rb b/spec/lib/banzai/filter/task_list_filter_spec.rb deleted file mode 100644 index 569cbc885c7..00000000000 --- a/spec/lib/banzai/filter/task_list_filter_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' - -describe Banzai::Filter::TaskListFilter, lib: true do - include FilterSpecHelper - - it 'does not apply `task-list` class to non-task lists' do - exp = act = %(<ul><li>Item</li></ul>) - expect(filter(act).to_html).to eq exp - end - - it 'applies `task-list` to single-item task lists' do - act = filter('<ul><li>[ ] Task 1</li></ul>') - - expect(act.to_html).to start_with '<ul class="task-list">' - end -end |