diff options
| author | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2016-06-27 00:18:46 +0900 |
|---|---|---|
| committer | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2016-07-03 12:23:19 +0900 |
| commit | b6863388984853ccd6e9b49aadac9c714454257f (patch) | |
| tree | e72d279bdbd3c58423e7d45c7d40a24fef9fa321 | |
| parent | fc3402b7eaa9e9839ac2b7087d9582f518b0bf96 (diff) | |
| download | gitlab-ce-b6863388984853ccd6e9b49aadac9c714454257f.tar.gz | |
Update RedCloth to 4.3.2 for CVE-2012-6684
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -107,7 +107,7 @@ 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.3' -gem 'RedCloth', '~> 4.2.9' +gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~>3.6' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 45cb327168c..34138decc13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.9) + RedCloth (4.3.2) ace-rails-ap (4.0.2) actionmailer (4.2.6) actionpack (= 4.2.6) @@ -803,7 +803,7 @@ PLATFORMS ruby DEPENDENCIES - RedCloth (~> 4.2.9) + RedCloth (~> 4.3.2) ace-rails-ap (~> 4.0.2) activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) |