Skip to content
Extraits de code Groupes Projets
Valider 9fc00d08 rédigé par Dennis Schubert's avatar Dennis Schubert
Parcourir les fichiers

Bump Redcarpet to fix OSVDB-120415

parent 5cabd692
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
# 0.4.1.3
* Update Redcarped, fixes [OSVDB-120415](http://osvdb.org/show/osvdb/120415).
# 0.4.1.2 # 0.4.1.2
* Update Rails, fixes [CVE-2014-7818](https://groups.google.com/forum/#!topic/rubyonrails-security/dCp7duBiQgo). * Update Rails, fixes [CVE-2014-7818](https://groups.google.com/forum/#!topic/rubyonrails-security/dCp7duBiQgo).
......
...@@ -68,7 +68,7 @@ gem 'messagebus_ruby_api', '1.0.3' ...@@ -68,7 +68,7 @@ gem 'messagebus_ruby_api', '1.0.3'
gem 'nokogiri', '1.6.1' gem 'nokogiri', '1.6.1'
gem 'rails_autolink', '1.1.5' gem 'rails_autolink', '1.1.5'
gem 'redcarpet', '3.1.2' gem 'redcarpet', '3.2.3'
gem 'roxml', '3.1.6' gem 'roxml', '3.1.6'
gem 'ruby-oembed', '0.8.9' gem 'ruby-oembed', '0.8.9'
gem 'opengraph_parser', '0.2.3' gem 'opengraph_parser', '0.2.3'
......
...@@ -361,7 +361,7 @@ GEM ...@@ -361,7 +361,7 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (3.1.2) redcarpet (3.2.3)
redis (3.1.0) redis (3.1.0)
redis-namespace (1.5.1) redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
...@@ -530,7 +530,7 @@ DEPENDENCIES ...@@ -530,7 +530,7 @@ DEPENDENCIES
rails_autolink (= 1.1.5) rails_autolink (= 1.1.5)
rb-fsevent (= 0.9.4) rb-fsevent (= 0.9.4)
rb-inotify (= 0.9.4) rb-inotify (= 0.9.4)
redcarpet (= 3.1.2) redcarpet (= 3.2.3)
remotipart (= 1.2.1) remotipart (= 1.2.1)
roxml (= 3.1.6) roxml (= 3.1.6)
rspec-instafail (= 0.2.4) rspec-instafail (= 0.2.4)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
defaults: defaults:
version: version:
number: "0.4.1.2" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head" number: "0.4.1.3" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
heroku: false heroku: false
environment: environment:
url: "http://localhost:3000/" url: "http://localhost:3000/"
......
...@@ -14,7 +14,7 @@ describe NotifierHelper do ...@@ -14,7 +14,7 @@ describe NotifierHelper do
# post for markdown test # post for markdown test
@markdown_post = FactoryGirl.create(:status_message) @markdown_post = FactoryGirl.create(:status_message)
@markdown_post.text = "[link](http://diasporafoundation.org) **bold text** *other text*" @markdown_post.text = "[link](http://diasporafoundation.org) **bold text** *other text*"
@striped_markdown_post = "link bold text other text" @striped_markdown_post = "link (http://diasporafoundation.org) bold text other text"
end end
it 'truncates in the post' do it 'truncates in the post' do
...@@ -37,7 +37,7 @@ describe NotifierHelper do ...@@ -37,7 +37,7 @@ describe NotifierHelper do
# comment for markdown test # comment for markdown test
@markdown_comment = FactoryGirl.create(:comment) @markdown_comment = FactoryGirl.create(:comment)
@markdown_comment.text = "[link](http://diasporafoundation.org) **bold text** *other text*" @markdown_comment.text = "[link](http://diasporafoundation.org) **bold text** *other text*"
@striped_markdown_comment = "link bold text other text" @striped_markdown_comment = "link (http://diasporafoundation.org) bold text other text"
end end
it 'truncates in the comment' do it 'truncates in the comment' do
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter