update to rails 3.2.18
This commit is contained in:
parent
ebb0a75b72
commit
a8641a654c
30 changed files with 32 additions and 32 deletions
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'rails', '= 3.2.16'
|
||||
gem 'rails', '= 3.2.18'
|
||||
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
||||
gem 'mysql2', '>= 0.3.11'
|
||||
|
||||
|
|
62
Gemfile.lock
62
Gemfile.lock
|
@ -75,12 +75,12 @@ GIT
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.2.16)
|
||||
actionpack (= 3.2.16)
|
||||
actionmailer (3.2.18)
|
||||
actionpack (= 3.2.18)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (3.2.16)
|
||||
activemodel (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
actionpack (3.2.18)
|
||||
activemodel (= 3.2.18)
|
||||
activesupport (= 3.2.18)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.4)
|
||||
|
@ -88,18 +88,18 @@ GEM
|
|||
rack-cache (~> 1.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.2.1)
|
||||
activemodel (3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
activemodel (3.2.18)
|
||||
activesupport (= 3.2.18)
|
||||
builder (~> 3.0.0)
|
||||
activerecord (3.2.16)
|
||||
activemodel (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
activerecord (3.2.18)
|
||||
activemodel (= 3.2.18)
|
||||
activesupport (= 3.2.18)
|
||||
arel (~> 3.0.2)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.2.16)
|
||||
activemodel (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
activesupport (3.2.16)
|
||||
activeresource (3.2.18)
|
||||
activemodel (= 3.2.18)
|
||||
activesupport (= 3.2.18)
|
||||
activesupport (3.2.18)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.3.5)
|
||||
|
@ -157,7 +157,7 @@ GEM
|
|||
tilt
|
||||
hike (1.2.3)
|
||||
http_parser.rb (0.5.3)
|
||||
i18n (0.6.8)
|
||||
i18n (0.6.9)
|
||||
journey (1.0.4)
|
||||
json (1.7.7)
|
||||
mail (2.5.4)
|
||||
|
@ -184,7 +184,7 @@ GEM
|
|||
parallel (0.5.21)
|
||||
passenger_monit (0.1.1)
|
||||
patron (0.4.18)
|
||||
polyglot (0.3.3)
|
||||
polyglot (0.3.4)
|
||||
progressbar (0.11.0)
|
||||
prompter (0.1.6)
|
||||
dye (>= 0.1.1)
|
||||
|
@ -197,28 +197,28 @@ GEM
|
|||
rack-fiber_pool (0.9.2)
|
||||
rack-protection (1.4.0)
|
||||
rack
|
||||
rack-ssl (1.3.3)
|
||||
rack-ssl (1.3.4)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.16)
|
||||
actionmailer (= 3.2.16)
|
||||
actionpack (= 3.2.16)
|
||||
activerecord (= 3.2.16)
|
||||
activeresource (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
rails (3.2.18)
|
||||
actionmailer (= 3.2.18)
|
||||
actionpack (= 3.2.18)
|
||||
activerecord (= 3.2.18)
|
||||
activeresource (= 3.2.18)
|
||||
activesupport (= 3.2.18)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.16)
|
||||
railties (= 3.2.18)
|
||||
rails-i18n (0.7.2)
|
||||
i18n (~> 0.5)
|
||||
railties (3.2.16)
|
||||
actionpack (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
railties (3.2.18)
|
||||
actionpack (= 3.2.18)
|
||||
activesupport (= 3.2.18)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.1.0)
|
||||
rake (10.3.1)
|
||||
rdiscount (1.6.8)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
|
@ -280,12 +280,12 @@ GEM
|
|||
tilt (~> 1.1, != 1.3.0)
|
||||
subexec (0.2.2)
|
||||
swf_converter (0.0.3)
|
||||
thor (0.18.1)
|
||||
thor (0.19.1)
|
||||
tilt (1.4.1)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.38)
|
||||
tzinfo (0.3.39)
|
||||
uglifier (1.3.0)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
|
@ -335,7 +335,7 @@ DEPENDENCIES
|
|||
patron (~> 0.4.18)
|
||||
rack-attack (~> 2.2.0)
|
||||
rack-fiber_pool
|
||||
rails (= 3.2.16)
|
||||
rails (= 3.2.18)
|
||||
rails-i18n
|
||||
rdiscount (~> 1.6.5)
|
||||
react-rails (~> 0.8.0.0)
|
||||
|
|
BIN
vendor/cache/actionmailer-3.2.16.gem
vendored
BIN
vendor/cache/actionmailer-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionmailer-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/actionmailer-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionpack-3.2.16.gem
vendored
BIN
vendor/cache/actionpack-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionpack-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/actionpack-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activemodel-3.2.16.gem
vendored
BIN
vendor/cache/activemodel-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/activemodel-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/activemodel-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activerecord-3.2.16.gem
vendored
BIN
vendor/cache/activerecord-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/activerecord-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/activerecord-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activeresource-3.2.16.gem
vendored
BIN
vendor/cache/activeresource-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/activeresource-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/activeresource-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activesupport-3.2.16.gem
vendored
BIN
vendor/cache/activesupport-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/activesupport-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/activesupport-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/i18n-0.6.8.gem
vendored
BIN
vendor/cache/i18n-0.6.8.gem
vendored
Binary file not shown.
BIN
vendor/cache/i18n-0.6.9.gem
vendored
Normal file
BIN
vendor/cache/i18n-0.6.9.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/polyglot-0.3.3.gem
vendored
BIN
vendor/cache/polyglot-0.3.3.gem
vendored
Binary file not shown.
BIN
vendor/cache/polyglot-0.3.4.gem
vendored
Normal file
BIN
vendor/cache/polyglot-0.3.4.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/rack-ssl-1.3.3.gem
vendored
BIN
vendor/cache/rack-ssl-1.3.3.gem
vendored
Binary file not shown.
BIN
vendor/cache/rack-ssl-1.3.4.gem
vendored
Normal file
BIN
vendor/cache/rack-ssl-1.3.4.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/rails-3.2.16.gem
vendored
BIN
vendor/cache/rails-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/rails-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/rails-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/railties-3.2.16.gem
vendored
BIN
vendor/cache/railties-3.2.16.gem
vendored
Binary file not shown.
BIN
vendor/cache/railties-3.2.18.gem
vendored
Normal file
BIN
vendor/cache/railties-3.2.18.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/rake-10.1.0.gem
vendored
BIN
vendor/cache/rake-10.1.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/rake-10.3.1.gem
vendored
Normal file
BIN
vendor/cache/rake-10.3.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/thor-0.18.1.gem
vendored
BIN
vendor/cache/thor-0.18.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/thor-0.19.1.gem
vendored
Normal file
BIN
vendor/cache/thor-0.19.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.38.gem
vendored
BIN
vendor/cache/tzinfo-0.3.38.gem
vendored
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.39.gem
vendored
Normal file
BIN
vendor/cache/tzinfo-0.3.39.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue