Merge branch 'update-task-list' into 'master'

Updates deckar01-task_list gem to its latest version See merge request !7185

Merge branch 'update-task-list' into 'master'
6eb77d9e · Rémy Coutable · 5a0a4506 · 0fa15505 · 6eb77d9e · 6eb77d9e
Commit 6eb77d9e authored Nov 04, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'seed-fu', '~> 2.3.5'

 # Markdown and HTML processing
 gem 'html-pipeline',      '~> 1.11.0'
-gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
+gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
 gem 'gitlab-markup',      '~> 1.5.0'
 gem 'redcarpet',          '~> 3.3.3'
 gem 'RedCloth',           '~> 4.3.2'

--- 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)