diff --git a/Changelog.md b/Changelog.md index 475b14b83..9ccc7e5e0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -210,6 +210,10 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add * Display polls on reshares [#5782](https://github.com/diaspora/diaspora/pull/5782) * Remove footer from stream pages [#5816](https://github.com/diaspora/diaspora/pull/5816) +# 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 edc5bbb2e..380681620 100644 --- a/Gemfile +++ b/Gemfile @@ -123,7 +123,7 @@ gem "messagebus_ruby_api", "1.0.3" # Parsing gem "nokogiri", "1.6.6.2" -gem "redcarpet", "3.2.2" +gem "redcarpet", "3.2.3" gem "twitter-text", "1.11.0" gem "roxml", "3.1.6" gem "ruby-oembed", "0.8.12" diff --git a/Gemfile.lock b/Gemfile.lock index a777c6155..1250a625b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -556,7 +556,7 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.2) + redcarpet (3.2.3) redis (3.2.1) redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) @@ -786,7 +786,7 @@ DEPENDENCIES rails_admin (= 0.6.7) rb-fsevent (= 0.9.4) rb-inotify (= 0.9.5) - redcarpet (= 3.2.2) + redcarpet (= 3.2.3) remotipart (= 1.2.1) responders (= 2.1.0) roxml (= 3.1.6)