diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-01 14:01:19 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-01 14:01:19 +0300 |
| commit | a28fe934d6d50699c564632803f44cb3120d0978 (patch) | |
| tree | 8b309c236067364e5aa900ba385a58429cc18111 | |
| parent | 8235d3ecdfb313714ea562a3fea70da7a4692a36 (diff) | |
| parent | 8d715fb104baf57219124fea0bc54d3f7846a1a3 (diff) | |
| download | gitlab-ce-a28fe934d6d50699c564632803f44cb3120d0978.tar.gz | |
Merge pull request #7628 from zzet/update_markdown
Update redcarpet gem
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -82,7 +82,7 @@ gem "seed-fu" gem "github-markup" # Required markup gems by github-markdown -gem 'redcarpet', '~> 2.2.2' +gem 'redcarpet', '~> 3.1.2' gem 'RedCloth' gem 'rdoc', '~>3.6' gem 'org-ruby' diff --git a/Gemfile.lock b/Gemfile.lock index cee22969215..b20f4169174 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) - redcarpet (2.2.2) + redcarpet (3.1.2) redis (3.0.6) redis-actionpack (4.0.0) actionpack (~> 4) @@ -659,7 +659,7 @@ DEPENDENCIES rb-fsevent rb-inotify rdoc (~> 3.6) - redcarpet (~> 2.2.2) + redcarpet (~> 3.1.2) redis-rails request_store rspec-rails |