update rails to 3.2.17
This commit is contained in:
parent
a8431430f0
commit
1df3f546c9
4 changed files with 33 additions and 29 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
# 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
|
# 0.3.0.2
|
||||||
|
|
||||||
## Bug fixes
|
## Bug fixes
|
||||||
|
|
|
||||||
2
Gemfile
2
Gemfile
|
|
@ -1,6 +1,6 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.16'
|
gem 'rails', '3.2.17'
|
||||||
|
|
||||||
# Appserver
|
# Appserver
|
||||||
|
|
||||||
|
|
|
||||||
54
Gemfile.lock
54
Gemfile.lock
|
|
@ -1,12 +1,12 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.16)
|
actionmailer (3.2.17)
|
||||||
actionpack (= 3.2.16)
|
actionpack (= 3.2.17)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (3.2.16)
|
actionpack (3.2.17)
|
||||||
activemodel (= 3.2.16)
|
activemodel (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
journey (~> 1.0.4)
|
||||||
|
|
@ -14,20 +14,20 @@ GEM
|
||||||
rack-cache (~> 1.2)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.2.1)
|
sprockets (~> 2.2.1)
|
||||||
activemodel (3.2.16)
|
activemodel (3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.16)
|
activerecord (3.2.17)
|
||||||
activemodel (= 3.2.16)
|
activemodel (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activerecord-import (0.3.1)
|
activerecord-import (0.3.1)
|
||||||
activerecord (~> 3.0)
|
activerecord (~> 3.0)
|
||||||
activeresource (3.2.16)
|
activeresource (3.2.17)
|
||||||
activemodel (= 3.2.16)
|
activemodel (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
activesupport (3.2.16)
|
activesupport (3.2.17)
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
i18n (~> 0.6, >= 0.6.4)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
acts-as-taggable-on (2.4.1)
|
acts-as-taggable-on (2.4.1)
|
||||||
|
|
@ -42,12 +42,12 @@ GEM
|
||||||
activemodel
|
activemodel
|
||||||
fog (>= 1.8.0)
|
fog (>= 1.8.0)
|
||||||
atomic (1.1.14)
|
atomic (1.1.14)
|
||||||
bcrypt-ruby (3.1.2)
|
|
||||||
backbone-on-rails (1.1.0.0)
|
backbone-on-rails (1.1.0.0)
|
||||||
eco
|
eco
|
||||||
ejs
|
ejs
|
||||||
jquery-rails
|
jquery-rails
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
|
bcrypt-ruby (3.1.2)
|
||||||
bootstrap-sass (2.2.2.0)
|
bootstrap-sass (2.2.2.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
builder (3.0.4)
|
builder (3.0.4)
|
||||||
|
|
@ -270,7 +270,7 @@ GEM
|
||||||
addressable
|
addressable
|
||||||
nokogiri
|
nokogiri
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.4)
|
||||||
pry (0.9.12.4)
|
pry (0.9.12.4)
|
||||||
coderay (~> 1.0)
|
coderay (~> 1.0)
|
||||||
method_source (~> 0.8)
|
method_source (~> 0.8)
|
||||||
|
|
@ -296,14 +296,14 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.16)
|
rails (3.2.17)
|
||||||
actionmailer (= 3.2.16)
|
actionmailer (= 3.2.17)
|
||||||
actionpack (= 3.2.16)
|
actionpack (= 3.2.17)
|
||||||
activerecord (= 3.2.16)
|
activerecord (= 3.2.17)
|
||||||
activeresource (= 3.2.16)
|
activeresource (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.16)
|
railties (= 3.2.17)
|
||||||
rails-i18n (0.7.4)
|
rails-i18n (0.7.4)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
rails_admin (0.4.9)
|
rails_admin (0.4.9)
|
||||||
|
|
@ -323,9 +323,9 @@ GEM
|
||||||
sass-rails (~> 3.1)
|
sass-rails (~> 3.1)
|
||||||
rails_autolink (1.1.5)
|
rails_autolink (1.1.5)
|
||||||
rails (> 3.1)
|
rails (> 3.1)
|
||||||
railties (3.2.16)
|
railties (3.2.17)
|
||||||
actionpack (= 3.2.16)
|
actionpack (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
|
|
@ -496,7 +496,7 @@ DEPENDENCIES
|
||||||
rack-protection (= 1.2)
|
rack-protection (= 1.2)
|
||||||
rack-rewrite (= 1.5.0)
|
rack-rewrite (= 1.5.0)
|
||||||
rack-ssl (= 1.3.3)
|
rack-ssl (= 1.3.3)
|
||||||
rails (= 3.2.16)
|
rails (= 3.2.17)
|
||||||
rails-i18n (= 0.7.4)
|
rails-i18n (= 0.7.4)
|
||||||
rails_admin (= 0.4.9)
|
rails_admin (= 0.4.9)
|
||||||
rails_autolink (= 1.1.5)
|
rails_autolink (= 1.1.5)
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
defaults:
|
defaults:
|
||||||
version:
|
version:
|
||||||
number: "0.3.0.2" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
|
number: "0.3.0.3" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
|
||||||
heroku: false
|
heroku: false
|
||||||
environment:
|
environment:
|
||||||
url: "http://localhost:3000/"
|
url: "http://localhost:3000/"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue