diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-31 16:35:54 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-31 16:35:54 +0000 |
| commit | bfa46a9eabbad40ab57454fd7233d8c3e199ed98 (patch) | |
| tree | 814018af8930155eb4aaabe60410801e71ed921a /Gemfile.lock | |
| parent | 882a591dcafd325f90fa3905a9ffee9b1e607676 (diff) | |
| parent | 760493a211d5d013eff1fd4c223f6da1c0efe16a (diff) | |
| download | gitlab-ce-bfa46a9eabbad40ab57454fd7233d8c3e199ed98.tar.gz | |
Merge branch 'task-list-2' into 'master'
Update task_list to version 2.0.0
Closes #22470
See merge request !11525
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 273a69792ef..b4252a2bdc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,10 +141,8 @@ GEM database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) - deckar01-task_list (1.0.6) - activesupport (~> 4.0) + deckar01-task_list (2.0.0) html-pipeline - rack (~> 1.0) default_value_for (3.0.2) activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) @@ -895,7 +893,7 @@ DEPENDENCIES creole (~> 0.5.0) d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) - deckar01-task_list (= 1.0.6) + deckar01-task_list (= 2.0.0) default_value_for (~> 3.0.0) devise (~> 4.2) devise-two-factor (~> 3.0.0) |