BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit a373422a by Robert Speicher
Options

Merge branch 'rs-issue-1911' into 'master'

Bump Redcarpet to 3.3.2 Closes #1911 See merge request !913
parents a7773dd7 c5b9d472
Showing with 3 additions and 3 deletions
Gemfile
...@@ -94,7 +94,7 @@ gem "seed-fu" ...@@ -94,7 +94,7 @@ gem "seed-fu"
gem 'html-pipeline', '~> 1.11.0' gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '1.0.2', require: 'task_list/railtie' gem 'task_list', '1.0.2', require: 'task_list/railtie'
gem 'github-markup' gem 'github-markup'
gem 'redcarpet', '~> 3.3.0' gem 'redcarpet', '~> 3.3.2'
gem 'RedCloth' gem 'RedCloth'
gem 'rdoc', '~>3.6' gem 'rdoc', '~>3.6'
gem 'org-ruby', '= 0.9.12' gem 'org-ruby', '= 0.9.12'
......
Gemfile.lock
...@@ -502,7 +502,7 @@ GEM ...@@ -502,7 +502,7 @@ GEM
trollop trollop
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (3.3.1) redcarpet (3.3.2)
redis (3.1.0) redis (3.1.0)
redis-actionpack (4.0.0) redis-actionpack (4.0.0)
actionpack (~> 4) actionpack (~> 4)
...@@ -822,7 +822,7 @@ DEPENDENCIES ...@@ -822,7 +822,7 @@ DEPENDENCIES
rails (= 4.1.11) rails (= 4.1.11)
raphael-rails (~> 2.1.2) raphael-rails (~> 2.1.2)
rdoc (~> 3.6) rdoc (~> 3.6)
redcarpet (~> 3.3.0) redcarpet (~> 3.3.2)
redis-rails redis-rails
request_store request_store
rerun (~> 0.10.0) rerun (~> 0.10.0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment