github/selfstarter
1
1
Fork 0
mirror of https://github.com/apigy/selfstarter.git synced 2026-01-07 21:43:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged in develop (pull request #1)

Browse Source 
[security fix] rails 3.2.12
This commit is contained in:
barry_allard
2013-03-19 21:32:49 -07:00
parent f5cee3cfce 7827beb183
commit 24585aeea4
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@@ -1,6 +1,9 @@
source 'https://rubygems.org'
gem 'rails', '3.2.11'
ruby '1.9.3'
gem 'rails', '3.2.13'
gem 'json', '~> 1.7.7'
group :development do
gem 'sqlite3'

50
Gemfile.lock
View File

@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.11)
actionpack (= 3.2.11)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,18 +14,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
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)
@@ -83,19 +83,19 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
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.11)
railties (= 3.2.13)
rails_config (0.3.2)
activesupport (>= 3.0)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -158,7 +158,7 @@ DEPENDENCIES
jquery-rails
pg
pry-rails
rails (= 3.2.11)
rails (= 3.2.13)
rails_config
rspec-rails (~> 2.0)
sass-rails (~> 3.2.3)

2
config/initializers/secret_token.rb
View File

@@ -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'