Update rails to (critical) version 3.2.11.
This commit is contained in:
parent
845f19c379
commit
d62f355854
2 changed files with 41 additions and 40 deletions
2
Gemfile
2
Gemfile
|
|
@ -1,7 +1,7 @@
|
||||||
# -*- mode: yaml; -*-
|
# -*- mode: yaml; -*-
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.5'
|
gem 'rails', '3.2.11'
|
||||||
|
|
||||||
gem 'mysql2', '0.3.11'
|
gem 'mysql2', '0.3.11'
|
||||||
|
|
||||||
|
|
|
||||||
79
Gemfile.lock
79
Gemfile.lock
|
|
@ -1,19 +1,19 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.5)
|
actionmailer (3.2.11)
|
||||||
actionpack (= 3.2.5)
|
actionpack (= 3.2.11)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.4.4)
|
||||||
actionpack (3.2.5)
|
actionpack (3.2.11)
|
||||||
activemodel (= 3.2.5)
|
activemodel (= 3.2.11)
|
||||||
activesupport (= 3.2.5)
|
activesupport (= 3.2.11)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.1)
|
journey (~> 1.0.4)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.4.0)
|
||||||
rack-cache (~> 1.2)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.1.3)
|
sprockets (~> 2.2.1)
|
||||||
activeadmin (0.4.0)
|
activeadmin (0.4.0)
|
||||||
bourbon (>= 1.0.0)
|
bourbon (>= 1.0.0)
|
||||||
devise (>= 1.1.2)
|
devise (>= 1.1.2)
|
||||||
|
|
@ -25,18 +25,18 @@ GEM
|
||||||
meta_search (>= 0.9.2)
|
meta_search (>= 0.9.2)
|
||||||
rails (>= 3.0.0)
|
rails (>= 3.0.0)
|
||||||
sass (>= 3.1.0)
|
sass (>= 3.1.0)
|
||||||
activemodel (3.2.5)
|
activemodel (3.2.11)
|
||||||
activesupport (= 3.2.5)
|
activesupport (= 3.2.11)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.5)
|
activerecord (3.2.11)
|
||||||
activemodel (= 3.2.5)
|
activemodel (= 3.2.11)
|
||||||
activesupport (= 3.2.5)
|
activesupport (= 3.2.11)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.5)
|
activeresource (3.2.11)
|
||||||
activemodel (= 3.2.5)
|
activemodel (= 3.2.11)
|
||||||
activesupport (= 3.2.5)
|
activesupport (= 3.2.11)
|
||||||
activesupport (3.2.5)
|
activesupport (3.2.11)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
arel (3.0.2)
|
arel (3.0.2)
|
||||||
|
|
@ -44,7 +44,7 @@ GEM
|
||||||
bootstrap-sass (2.0.2)
|
bootstrap-sass (2.0.2)
|
||||||
bourbon (1.4.0)
|
bourbon (1.4.0)
|
||||||
sass (>= 3.1)
|
sass (>= 3.1)
|
||||||
builder (3.0.0)
|
builder (3.0.4)
|
||||||
cancan (1.6.5)
|
cancan (1.6.5)
|
||||||
capistrano (2.5.21)
|
capistrano (2.5.21)
|
||||||
highline
|
highline
|
||||||
|
|
@ -78,11 +78,11 @@ GEM
|
||||||
has_scope (0.5.1)
|
has_scope (0.5.1)
|
||||||
highline (1.6.12)
|
highline (1.6.12)
|
||||||
hike (1.2.1)
|
hike (1.2.1)
|
||||||
i18n (0.6.0)
|
i18n (0.6.1)
|
||||||
inherited_resources (1.2.2)
|
inherited_resources (1.2.2)
|
||||||
has_scope (~> 0.5.0)
|
has_scope (~> 0.5.0)
|
||||||
responders (~> 0.6.0)
|
responders (~> 0.6.0)
|
||||||
journey (1.0.3)
|
journey (1.0.4)
|
||||||
jquery-rails (2.0.2)
|
jquery-rails (2.0.2)
|
||||||
railties (>= 3.2.0, < 5.0)
|
railties (>= 3.2.0, < 5.0)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
|
|
@ -100,8 +100,8 @@ GEM
|
||||||
activerecord (~> 3.1)
|
activerecord (~> 3.1)
|
||||||
activesupport (~> 3.1)
|
activesupport (~> 3.1)
|
||||||
polyamorous (~> 0.5.0)
|
polyamorous (~> 0.5.0)
|
||||||
mime-types (1.18)
|
mime-types (1.19)
|
||||||
multi_json (1.3.6)
|
multi_json (1.5.0)
|
||||||
multipart-post (1.1.5)
|
multipart-post (1.1.5)
|
||||||
mysql2 (0.3.11)
|
mysql2 (0.3.11)
|
||||||
net-scp (1.0.4)
|
net-scp (1.0.4)
|
||||||
|
|
@ -115,29 +115,29 @@ GEM
|
||||||
polyamorous (0.5.0)
|
polyamorous (0.5.0)
|
||||||
activerecord (~> 3.0)
|
activerecord (~> 3.0)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.3)
|
||||||
rack (1.4.1)
|
rack (1.4.3)
|
||||||
rack-cache (1.2)
|
rack-cache (1.2)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-ssl (1.3.2)
|
rack-ssl (1.3.2)
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.1)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.5)
|
rails (3.2.11)
|
||||||
actionmailer (= 3.2.5)
|
actionmailer (= 3.2.11)
|
||||||
actionpack (= 3.2.5)
|
actionpack (= 3.2.11)
|
||||||
activerecord (= 3.2.5)
|
activerecord (= 3.2.11)
|
||||||
activeresource (= 3.2.5)
|
activeresource (= 3.2.11)
|
||||||
activesupport (= 3.2.5)
|
activesupport (= 3.2.11)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.5)
|
railties (= 3.2.11)
|
||||||
railties (3.2.5)
|
railties (3.2.11)
|
||||||
actionpack (= 3.2.5)
|
actionpack (= 3.2.11)
|
||||||
activesupport (= 3.2.5)
|
activesupport (= 3.2.11)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
thor (>= 0.14.6, < 2.0)
|
thor (>= 0.14.6, < 2.0)
|
||||||
rake (0.9.2.2)
|
rake (10.0.3)
|
||||||
rdoc (3.12)
|
rdoc (3.12)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
responders (0.6.5)
|
responders (0.6.5)
|
||||||
|
|
@ -148,20 +148,21 @@ GEM
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
tilt (~> 1.3)
|
tilt (~> 1.3)
|
||||||
simple_oauth (0.1.8)
|
simple_oauth (0.1.8)
|
||||||
sprockets (2.1.3)
|
sprockets (2.2.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
thor (0.15.2)
|
thor (0.16.0)
|
||||||
tilt (1.3.3)
|
tilt (1.3.3)
|
||||||
treetop (1.4.10)
|
treetop (1.4.12)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
twitter (2.5.0)
|
twitter (2.5.0)
|
||||||
faraday (~> 0.8)
|
faraday (~> 0.8)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
simple_oauth (~> 0.1.6)
|
simple_oauth (~> 0.1.6)
|
||||||
tzinfo (0.3.33)
|
tzinfo (0.3.35)
|
||||||
uglifier (1.2.4)
|
uglifier (1.2.4)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (>= 1.0.2)
|
multi_json (>= 1.0.2)
|
||||||
|
|
@ -184,7 +185,7 @@ DEPENDENCIES
|
||||||
json (= 1.6.5)
|
json (= 1.6.5)
|
||||||
mail
|
mail
|
||||||
mysql2 (= 0.3.11)
|
mysql2 (= 0.3.11)
|
||||||
rails (= 3.2.5)
|
rails (= 3.2.11)
|
||||||
rmagick (= 2.9.2)
|
rmagick (= 2.9.2)
|
||||||
sass-rails (= 3.2.5)
|
sass-rails (= 3.2.5)
|
||||||
twitter (= 2.5.0)
|
twitter (= 2.5.0)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue