nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump Redcarpet to fix OSVDB-120415

Browse source
This commit is contained in:
Dennis Schubert 2015-04-11 19:51:18 +02:00
parent 5cabd6924b
commit 9fc00d0814
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -1,3 +1,7 @@
# 0.4.1.3
* Update Redcarped, fixes [OSVDB-120415](http://osvdb.org/show/osvdb/120415).
# 0.4.1.2
* Update Rails, fixes [CVE-2014-7818](https://groups.google.com/forum/#!topic/rubyonrails-security/dCp7duBiQgo).

2
Gemfile
View file

@ -68,7 +68,7 @@ gem 'messagebus_ruby_api', '1.0.3'
gem 'nokogiri', '1.6.1'
gem 'rails_autolink', '1.1.5'
gem 'redcarpet', '3.1.2'
gem 'redcarpet', '3.2.3'
gem 'roxml', '3.1.6'
gem 'ruby-oembed', '0.8.9'
gem 'opengraph_parser', '0.2.3'

4
Gemfile.lock
View file

@ -361,7 +361,7 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.1.2)
redcarpet (3.2.3)
redis (3.1.0)
redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4)
@ -530,7 +530,7 @@ DEPENDENCIES
rails_autolink (= 1.1.5)
rb-fsevent (= 0.9.4)
rb-inotify (= 0.9.4)
redcarpet (= 3.1.2)
redcarpet (= 3.2.3)
remotipart (= 1.2.1)
roxml (= 3.1.6)
rspec-instafail (= 0.2.4)

2
config/defaults.yml
View file

@ -4,7 +4,7 @@
defaults:
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
environment:
url: "http://localhost:3000/"

4
spec/helpers/notifier_helper_spec.rb
View file

@ -14,7 +14,7 @@ describe NotifierHelper do
# post for markdown test
@markdown_post = FactoryGirl.create(:status_message)
@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
it 'truncates in the post' do
@ -37,7 +37,7 @@ describe NotifierHelper do
# comment for markdown test
@markdown_comment = FactoryGirl.create(:comment)
@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
it 'truncates in the comment' do