diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-15 20:14:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-15 20:14:42 +0000 |
| commit | 8b5406345332ee088dfd50d19921afe2daa9b601 (patch) | |
| tree | 8db0cd0708c85d9cc7e2b7f090d1b3a525dfcbcd | |
| parent | 6df06ded12878fb7b5fb01626ea40344f22a5c5b (diff) | |
| parent | c82755f539fdcea08bb668d2b5abb4304787c96e (diff) | |
| download | gitlab-ce-8b5406345332ee088dfd50d19921afe2daa9b601.tar.gz | |
Merge branch 'update-redcarpet' into 'master'
Update redcarpet gem. Fixes gem memory leak
Fixes #2773
See merge request !1607
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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) |