diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-14 10:42:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-14 10:42:25 +0000 |
| commit | 26f612505c76a0b37f33e278acfc6a9ab65a323d (patch) | |
| tree | 0e0b1d78126fa082679c54916fb13ed94b878812 | |
| parent | ea636ebb7e925deb10dbdb9a02b88b3e82982bb3 (diff) | |
| parent | 27a8d84094aef3fb50bc98e46c98b6148d28ac4a (diff) | |
| download | gitlab-ce-26f612505c76a0b37f33e278acfc6a9ab65a323d.tar.gz | |
Merge branch 'rs-issue-1432' into 'master'
Update Redcarpet to 3.3.0
Fixes #1432
See merge request !809
| -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" gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '1.0.2', require: 'task_list/railtie' gem 'github-markup' -gem 'redcarpet', '~> 3.2.3' +gem 'redcarpet', '~> 3.3.0' gem 'RedCloth' gem 'rdoc', '~>3.6' gem 'org-ruby', '= 0.9.12' diff --git a/Gemfile.lock b/Gemfile.lock index 1de29ad8f8a..fd7cbd508e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -499,7 +499,7 @@ GEM trollop rdoc (3.12.2) json (~> 1.4) - redcarpet (3.2.3) + redcarpet (3.3.1) redis (3.1.0) redis-actionpack (4.0.0) actionpack (~> 4) @@ -810,7 +810,7 @@ DEPENDENCIES rails (~> 4.1.0) raphael-rails (~> 2.1.2) rdoc (~> 3.6) - redcarpet (~> 3.2.3) + redcarpet (~> 3.3.0) redis-rails request_store rerun (~> 0.10.0) |