summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJared Deckard <jared.deckard@gmail.com>2016-09-30 16:38:02 -0500
committerJared Deckard <jared.deckard@gmail.com>2016-09-30 16:38:02 -0500
commit88c1db4a2b365a75a43c46a0bed58ca1f8069408 (patch)
treea1a0ba8f225f3334c0df2db004ecf9a0bafda168 /Gemfile.lock
parentf4d4113240e6851fd8eede1170a60c06b22578e1 (diff)
downloadgitlab-ce-88c1db4a2b365a75a43c46a0bed58ca1f8069408.tar.gz
Replace talk_list patch with a patched fork
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f15715a20ff..ca06b21ae65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,6 +157,10 @@ GEM
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
+ deckar01-task_list (1.0.5)
+ activesupport (~> 4.0)
+ html-pipeline
+ rack (~> 1.0)
default_value_for (3.0.2)
activerecord (>= 3.2.0, < 5.1)
descendants_tracker (0.0.4)
@@ -725,8 +729,6 @@ GEM
ffi
sysexits (1.2.0)
systemu (2.6.5)
- task_list (1.0.2)
- html-pipeline
teaspoon (1.1.5)
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.2.0)
@@ -831,6 +833,7 @@ DEPENDENCIES
creole (~> 0.5.0)
d3_rails (~> 3.5.0)
database_cleaner (~> 1.5.0)
+ deckar01-task_list (= 1.0.5)
default_value_for (~> 3.0.0)
devise (~> 4.2)
devise-two-factor (~> 3.0.0)
@@ -963,7 +966,6 @@ DEPENDENCIES
sprockets-es6 (~> 0.9.2)
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
- task_list (~> 1.0.2)
teaspoon (~> 1.1.0)
teaspoon-jasmine (~> 2.2.0)
test_after_commit (~> 0.4.2)