Permalink
Browse files

Merge pull request #37 from steakknife/develop

[security] rails 3.2.12 -> 3.2.13
  • Loading branch information...
Jarred-Sumner committed Mar 27, 2013
2 parents 5936a23 + 302cf7e commit a730c5784f8e9d591970b035bdbf8b330c58951d
Showing with 38 additions and 34 deletions.
  1. +4 −1 Gemfile
  2. +33 −32 Gemfile.lock
  3. +1 −1 config/initializers/secret_token.rb
View
@@ -1,6 +1,9 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.12'
+ruby '1.9.3'
+
+gem 'rails', '3.2.13'
+gem 'json', '~> 1.7.7'
group :development do
gem 'sqlite3'
View
@@ -1,36 +1,36 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
i18n (~> 0.6)
multi_json (~> 1.0)
amazon_flex_pay (0.9.13)
activesupport (>= 3.0.14)
- multi_xml (~> 0.2.0)
+ multi_xml (>= 0.5.2)
rest-client (~> 1.6.1)
arel (3.0.2)
bourne (1.1.2)
@@ -56,7 +56,7 @@ GEM
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.6)
+ json (1.7.7)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -66,8 +66,8 @@ GEM
mime-types (1.19)
mocha (0.10.5)
metaclass (~> 0.0.1)
- multi_json (1.5.0)
- multi_xml (0.2.2)
+ multi_json (1.7.1)
+ multi_xml (0.5.3)
pg (0.14.1)
polyglot (0.3.3)
pry (0.9.10)
@@ -76,26 +76,26 @@ GEM
slop (~> 3.3.1)
pry-rails (0.2.2)
pry (>= 0.9.10)
- rack (1.4.3)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.12)
+ railties (= 3.2.13)
rails_config (0.3.2)
activesupport (>= 3.0)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -156,9 +156,10 @@ DEPENDENCIES
amazon_flex_pay
coffee-rails (~> 3.2.1)
jquery-rails
+ json (~> 1.7.7)
pg
pry-rails
- rails (= 3.2.12)
+ rails (= 3.2.13)
rails_config
rspec-rails (~> 2.0)
sass-rails (~> 3.2.3)
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Selfstarter::Application.config.secret_token = '686a073cf783e29dee02cb7544762d17a7c769acf7baa148a0d9726a39e45123532418f9ce7cd3def2ca0e3d5bff9d0b9ffd41f19b0c6b6dd9d0cc10b77fc5ae'
+Selfstarter::Application.config.secret_token = ENV['RAILS_SECRET_TOKEN'] || '686a073cf783e29dee02cb7544762d17a7c769acf7baa148a0d9726a39e45123532418f9ce7cd3def2ca0e3d5bff9d0b9ffd41f19b0c6b6dd9d0cc10b77fc5ae'

0 comments on commit a730c57

Please sign in to comment.