diff options
| author | Florian Staudacher <florian_staudacher@yahoo.de> | 2013-01-09 02:34:58 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2013-01-09 03:09:07 +0400 |
| commit | b320e50236b6b764b2d797f4be4a443a6c0b0cd2 (patch) | |
| tree | f10e569817ed669e4fd87611bbade44de422aeab | |
| parent | 947127bec357054b13f771e4ad3ad8d41cd91159 (diff) | |
bump Rails to 3.2.11v0.0.2.2
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
| -rw-r--r-- | Changelog.md | 4 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 52 | ||||
| -rw-r--r-- | config/defaults.yml | 2 |
4 files changed, 32 insertions, 28 deletions
diff --git a/Changelog.md b/Changelog.md index 1b0476ed9..6e6057f3f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# 0.0.2.2 + +* Upgrade to Rails 3.2.11 (CVE-2012-0155, CVE-2012-0156). [Read more](http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/) + # 0.0.2.1 * Upgrade to Rails 3.2.10 as per CVE-2012-5664. [Read more](https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53) @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.10' +gem 'rails', '3.2.11' gem 'foreman', '0.60.2' diff --git a/Gemfile.lock b/Gemfile.lock index 8d30ba0e2..d0262c302 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,12 +17,12 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.10) - actionpack (= 3.2.10) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.10) - activemodel (= 3.2.10) - activesupport (= 3.2.10) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -30,21 +30,21 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.10) - activesupport (= 3.2.10) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.10) - activemodel (= 3.2.10) - activesupport (= 3.2.10) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-import (0.2.11) activerecord (~> 3.0) activerecord (~> 3.0) - activeresource (3.2.10) - activemodel (= 3.2.10) - activesupport (= 3.2.10) - activesupport (3.2.10) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) acts-as-taggable-on (2.3.3) @@ -273,7 +273,7 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - rack (1.4.1) + rack (1.4.3) rack-cache (1.2) rack (>= 0.4) rack-cors (0.2.7) @@ -292,14 +292,14 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.10) - actionmailer (= 3.2.10) - actionpack (= 3.2.10) - activerecord (= 3.2.10) - activeresource (= 3.2.10) - activesupport (= 3.2.10) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.10) + railties (= 3.2.11) rails-i18n (0.7.0) i18n (~> 0.5) rails_admin (0.2.0) @@ -318,9 +318,9 @@ GEM sass-rails (~> 3.1) rails_autolink (1.0.9) rails (~> 3.1) - railties (3.2.10) - actionpack (= 3.2.10) - activesupport (= 3.2.10) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -473,7 +473,7 @@ DEPENDENCIES rack-protection (= 1.2) rack-rewrite (= 1.3.1) rack-ssl (= 1.3.2) - rails (= 3.2.10) + rails (= 3.2.11) rails-i18n (= 0.7.0) rails_admin (= 0.2.0) rails_autolink (= 1.0.9) diff --git a/config/defaults.yml b/config/defaults.yml index 4d11a5c41..62165e9fe 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,7 +4,7 @@ defaults: version: - number: "0.0.2.1" + number: "0.0.2.2" release: true # Do not touch unless in a merge conflict on doing a release, master should have a commit setting this to true which is not backported to the develop branch. heroku: false environment: |