summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-15 18:01:24 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-15 18:01:24 +0200
commitc82755f539fdcea08bb668d2b5abb4304787c96e (patch)
tree73d6d672b37bb336a9e53ed33f6d619604d3b951
parent19cfa86aa3db83fcd90f3dd967c18ad3cd3e729e (diff)
downloadgitlab-ce-update-redcarpet.tar.gz
Update redcarpet gem. Fixes gem memory leakupdate-redcarpet
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 4fbd37f6c8b..9254ce2ccfa 100644
--- 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index b92d9766d3a..53122898b07 100644
--- 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)