forked from OpenNeo/impress
security update: rails 3.2.13
This commit is contained in:
parent
e5702076ff
commit
d7c027718d
27 changed files with 37 additions and 36 deletions
4
Gemfile
4
Gemfile
|
@ -1,6 +1,6 @@
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '= 3.2.12'
|
gem 'rails', '= 3.2.13'
|
||||||
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
||||||
gem 'mysql2', '>= 0.3.11'
|
gem 'mysql2', '>= 0.3.11'
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ gem 'neopets', '~> 0.2.0', :git => 'git://github.com/matchu/neopets.git'
|
||||||
gem "mini_magick", "~> 3.4"
|
gem "mini_magick", "~> 3.4"
|
||||||
|
|
||||||
gem "fog", "~> 1.8.0"
|
gem "fog", "~> 1.8.0"
|
||||||
gem "carrierwave", "~> 0.5.8"
|
gem "carrierwave", "~> 0.8.0"
|
||||||
|
|
||||||
gem "parallel", "~> 0.5.17"
|
gem "parallel", "~> 0.5.17"
|
||||||
|
|
||||||
|
|
69
Gemfile.lock
69
Gemfile.lock
|
@ -75,12 +75,12 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.12)
|
actionmailer (3.2.13)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 3.2.13)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.5.3)
|
||||||
actionpack (3.2.12)
|
actionpack (3.2.13)
|
||||||
activemodel (= 3.2.12)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
journey (~> 1.0.4)
|
||||||
|
@ -88,19 +88,19 @@ 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.12)
|
activemodel (3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.12)
|
activerecord (3.2.13)
|
||||||
activemodel (= 3.2.12)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.12)
|
activeresource (3.2.13)
|
||||||
activemodel (= 3.2.12)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
activesupport (3.2.12)
|
activesupport (3.2.13)
|
||||||
i18n (~> 0.6)
|
i18n (= 0.6.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
addressable (2.3.3)
|
addressable (2.3.3)
|
||||||
airbrake (3.1.8)
|
airbrake (3.1.8)
|
||||||
|
@ -110,8 +110,9 @@ GEM
|
||||||
arel (3.0.2)
|
arel (3.0.2)
|
||||||
bcrypt-ruby (3.0.1)
|
bcrypt-ruby (3.0.1)
|
||||||
builder (3.0.4)
|
builder (3.0.4)
|
||||||
carrierwave (0.5.8)
|
carrierwave (0.8.0)
|
||||||
activesupport (~> 3.0)
|
activemodel (>= 3.2.0)
|
||||||
|
activesupport (>= 3.2.0)
|
||||||
character-encodings (0.4.1)
|
character-encodings (0.4.1)
|
||||||
chronic (0.6.7)
|
chronic (0.6.7)
|
||||||
chunky_png (1.2.7)
|
chunky_png (1.2.7)
|
||||||
|
@ -156,10 +157,10 @@ GEM
|
||||||
tilt
|
tilt
|
||||||
hike (1.2.1)
|
hike (1.2.1)
|
||||||
http_parser.rb (0.5.3)
|
http_parser.rb (0.5.3)
|
||||||
i18n (0.6.4)
|
i18n (0.6.1)
|
||||||
journey (1.0.4)
|
journey (1.0.4)
|
||||||
json (1.7.7)
|
json (1.7.7)
|
||||||
mail (2.4.4)
|
mail (2.5.3)
|
||||||
i18n (>= 0.4.0)
|
i18n (>= 0.4.0)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
|
@ -198,19 +199,19 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.12)
|
rails (3.2.13)
|
||||||
actionmailer (= 3.2.12)
|
actionmailer (= 3.2.13)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 3.2.13)
|
||||||
activerecord (= 3.2.12)
|
activerecord (= 3.2.13)
|
||||||
activeresource (= 3.2.12)
|
activeresource (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.12)
|
railties (= 3.2.13)
|
||||||
rails-i18n (0.7.2)
|
rails-i18n (0.7.2)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
railties (3.2.12)
|
railties (3.2.13)
|
||||||
actionpack (= 3.2.12)
|
actionpack (= 3.2.13)
|
||||||
activesupport (= 3.2.12)
|
activesupport (= 3.2.13)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
|
@ -273,11 +274,11 @@ GEM
|
||||||
subexec (0.2.2)
|
subexec (0.2.2)
|
||||||
swf_converter (0.0.3)
|
swf_converter (0.0.3)
|
||||||
thor (0.17.0)
|
thor (0.17.0)
|
||||||
tilt (1.3.4)
|
tilt (1.3.6)
|
||||||
treetop (1.4.12)
|
treetop (1.4.12)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.36)
|
tzinfo (0.3.37)
|
||||||
uglifier (1.3.0)
|
uglifier (1.3.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.0, >= 1.0.2)
|
multi_json (~> 1.0, >= 1.0.2)
|
||||||
|
@ -298,7 +299,7 @@ DEPENDENCIES
|
||||||
RocketAMF!
|
RocketAMF!
|
||||||
addressable
|
addressable
|
||||||
airbrake (~> 3.1.8)
|
airbrake (~> 3.1.8)
|
||||||
carrierwave (~> 0.5.8)
|
carrierwave (~> 0.8.0)
|
||||||
character-encodings (~> 0.4.1)
|
character-encodings (~> 0.4.1)
|
||||||
compass-rails (~> 1.0.3)
|
compass-rails (~> 1.0.3)
|
||||||
devise (~> 2.2.3)
|
devise (~> 2.2.3)
|
||||||
|
@ -325,7 +326,7 @@ DEPENDENCIES
|
||||||
parallel (~> 0.5.17)
|
parallel (~> 0.5.17)
|
||||||
patron (~> 0.4.18)
|
patron (~> 0.4.18)
|
||||||
rack-fiber_pool
|
rack-fiber_pool
|
||||||
rails (= 3.2.12)
|
rails (= 3.2.13)
|
||||||
rails-i18n
|
rails-i18n
|
||||||
rdiscount (~> 1.6.5)
|
rdiscount (~> 1.6.5)
|
||||||
resque (~> 1.23.0)
|
resque (~> 1.23.0)
|
||||||
|
|
BIN
vendor/cache/actionmailer-3.2.12.gem
vendored
BIN
vendor/cache/actionmailer-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionmailer-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/actionmailer-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionpack-3.2.12.gem
vendored
BIN
vendor/cache/actionpack-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionpack-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/actionpack-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activemodel-3.2.12.gem
vendored
BIN
vendor/cache/activemodel-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/activemodel-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/activemodel-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activerecord-3.2.12.gem
vendored
BIN
vendor/cache/activerecord-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/activerecord-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/activerecord-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activeresource-3.2.12.gem
vendored
BIN
vendor/cache/activeresource-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/activeresource-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/activeresource-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activesupport-3.2.12.gem
vendored
BIN
vendor/cache/activesupport-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/activesupport-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/activesupport-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/carrierwave-0.5.8.gem
vendored
BIN
vendor/cache/carrierwave-0.5.8.gem
vendored
Binary file not shown.
BIN
vendor/cache/carrierwave-0.8.0.gem
vendored
Normal file
BIN
vendor/cache/carrierwave-0.8.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/i18n-0.6.1.gem
vendored
Normal file
BIN
vendor/cache/i18n-0.6.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/i18n-0.6.4.gem
vendored
BIN
vendor/cache/i18n-0.6.4.gem
vendored
Binary file not shown.
BIN
vendor/cache/mail-2.4.4.gem
vendored
BIN
vendor/cache/mail-2.4.4.gem
vendored
Binary file not shown.
BIN
vendor/cache/mail-2.5.3.gem
vendored
Normal file
BIN
vendor/cache/mail-2.5.3.gem
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
vendor/cache/railties-3.2.12.gem
vendored
BIN
vendor/cache/railties-3.2.12.gem
vendored
Binary file not shown.
BIN
vendor/cache/railties-3.2.13.gem
vendored
Normal file
BIN
vendor/cache/railties-3.2.13.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/tilt-1.3.4.gem
vendored
BIN
vendor/cache/tilt-1.3.4.gem
vendored
Binary file not shown.
BIN
vendor/cache/tilt-1.3.6.gem
vendored
Normal file
BIN
vendor/cache/tilt-1.3.6.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.36.gem
vendored
BIN
vendor/cache/tzinfo-0.3.36.gem
vendored
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.37.gem
vendored
Normal file
BIN
vendor/cache/tzinfo-0.3.37.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue