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

Bump Redcarpet to 3.3.2

Closes #1911

See merge request !913
This commit is contained in:
Robert Speicher 2015-07-01 00:53:08 +00:00
commit a373422adf
2 changed files with 3 additions and 3 deletions

View file

@ -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.3.0'
gem 'redcarpet', '~> 3.3.2'
gem 'RedCloth'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '= 0.9.12'

View file

@ -502,7 +502,7 @@ GEM
trollop
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.3.1)
redcarpet (3.3.2)
redis (3.1.0)
redis-actionpack (4.0.0)
actionpack (~> 4)
@ -822,7 +822,7 @@ DEPENDENCIES
rails (= 4.1.11)
raphael-rails (~> 2.1.2)
rdoc (~> 3.6)
redcarpet (~> 3.3.0)
redcarpet (~> 3.3.2)
redis-rails
request_store
rerun (~> 0.10.0)