Merge branch 'update-redcarpet' into 'master'

Update redcarpet gem. Fixes gem memory leak Fixes #2773 See merge request !1607

Merge branch 'update-redcarpet' into 'master'
8b540634 · Robert Speicher · 6df06ded · c82755f5 · 8b540634 · 8b540634
Commit 8b540634 authored Oct 15, 2015 by Robert Speicher
Show 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
@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
 gem 'html-pipeline', '~> 1.11.0'
 gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
 gem 'github-markup', '~> 1.3.1'
-gem 'redcarpet',     '~> 3.3.2'
+gem 'redcarpet',     '~> 3.3.3'
 gem 'RedCloth',      '~> 4.2.9'
 gem 'rdoc',          '~>3.6'
 gem 'org-ruby',      '~> 0.9.12'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -539,7 +539,7 @@ GEM
      trollop
    rdoc (3.12.2)
      json (~> 1.4)
-    redcarpet (3.3.2)
+    redcarpet (3.3.3)
    redis (3.2.1)
    redis-actionpack (4.0.0)
      actionpack (~> 4)
@@ -881,7 +881,7 @@ DEPENDENCIES
  rails (= 4.1.12)
  raphael-rails (~> 2.1.2)
  rdoc (~> 3.6)
-  redcarpet (~> 3.3.2)
+  redcarpet (~> 3.3.3)
  redis-rails (~> 4.0.0)
  request_store (~> 1.2.0)
  rerun (~> 0.10.0)