From 9fc00d0814807064e2dc7343fc330f7cdcf8112a Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Sat, 11 Apr 2015 19:51:18 +0200
Subject: [PATCH] Bump Redcarpet to fix OSVDB-120415
---
Changelog.md | 4 ++++
Gemfile | 2 +-
Gemfile.lock | 4 ++--
config/defaults.yml | 2 +-
spec/helpers/notifier_helper_spec.rb | 4 ++--
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index 855aef878e..396e70d442 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -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).
diff --git a/Gemfile b/Gemfile
index 91c9ce04dc..e9d70aef2d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4cb7972643..86b6f0bc32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
diff --git a/config/defaults.yml b/config/defaults.yml
index c7434bafda..bd6d1f42ac 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -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/"
diff --git a/spec/helpers/notifier_helper_spec.rb b/spec/helpers/notifier_helper_spec.rb
index 9f3e887e98..5917afbc8a 100644
--- a/spec/helpers/notifier_helper_spec.rb
+++ b/spec/helpers/notifier_helper_spec.rb
@@ -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
--
GitLab