summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-04 16:01:46 +0000
committerRémy Coutable <remy@rymai.me>2016-11-04 16:01:46 +0000
commit6eb77d9e5a6151570dd6b247b81e49f23ffd7770 (patch)
tree3c543cb5bb8bc0fc2a7b4cec57bd7db04dd5e784 /Gemfile.lock
parent5a0a4506d2e27ce4da7bcd6122d519054b015ab0 (diff)
parent0fa15505345c78ec0aa5576b100cecd269714503 (diff)
downloadgitlab-ce-6eb77d9e5a6151570dd6b247b81e49f23ffd7770.tar.gz
Merge branch 'update-task-list' into 'master'
Updates deckar01-task_list gem to its latest version See merge request !7185
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ecff5f6a68..6ea0578d9d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,7 +159,7 @@ GEM
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (1.0.5)
+ deckar01-task_list (1.0.6)
activesupport (~> 4.0)
html-pipeline
rack (~> 1.0)
@@ -840,7 +840,7 @@ DEPENDENCIES
creole (~> 0.5.0)
d3_rails (~> 3.5.0)
database_cleaner (~> 1.5.0)
- deckar01-task_list (= 1.0.5)
+ deckar01-task_list (= 1.0.6)
default_value_for (~> 3.0.0)
devise (~> 4.2)
devise-two-factor (~> 3.0.0)