diff --git a/Changelog.md b/Changelog.md index 8f754b1fc..ee95b50dc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -21,6 +21,10 @@ * Add permalinks for comments [#4577](https://github.com/diaspora/diaspora/pull/4577) * New menu for the mobile version [#4673](https://github.com/diaspora/diaspora/pull/4673) +# 0.3.0.3 + +* Bump Rails to 3.2.17, fixes CVE-2014-0081, CVE-2014-0082. For more information see http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/ + # 0.3.0.2 ## Bug fixes diff --git a/Gemfile b/Gemfile index 3d84fcc44..a75f31973 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.16' +gem 'rails', '3.2.17' # Appserver diff --git a/Gemfile.lock b/Gemfile.lock index 0816a46c3..a82351d6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.16) - actionpack (= 3.2.16) + actionmailer (3.2.17) + actionpack (= 3.2.17) mail (~> 2.5.4) - actionpack (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,20 +14,20 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.16) - activesupport (= 3.2.16) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-import (0.3.1) activerecord (~> 3.0) - activeresource (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) - activesupport (3.2.16) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts-as-taggable-on (2.4.1) @@ -270,7 +270,7 @@ GEM addressable nokogiri orm_adapter (0.5.0) - polyglot (0.3.3) + polyglot (0.3.4) pry (0.9.12.4) coderay (~> 1.0) method_source (~> 0.8) @@ -296,14 +296,14 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.16) - actionmailer (= 3.2.16) - actionpack (= 3.2.16) - activerecord (= 3.2.16) - activeresource (= 3.2.16) - activesupport (= 3.2.16) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.16) + railties (= 3.2.17) rails-i18n (0.7.4) i18n (~> 0.5) rails-timeago (2.4.0) @@ -326,9 +326,9 @@ GEM sass-rails (~> 3.1) rails_autolink (1.1.5) rails (> 3.1) - railties (3.2.16) - actionpack (= 3.2.16) - activesupport (= 3.2.16) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -499,7 +499,7 @@ DEPENDENCIES rack-protection (= 1.2) rack-rewrite (= 1.5.0) rack-ssl (= 1.3.3) - rails (= 3.2.16) + rails (= 3.2.17) rails-i18n (= 0.7.4) rails-timeago rails_admin (= 0.4.9)