cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to rails 3.2.9

Browse source
This commit is contained in:
Tom Hughes 2012-11-12 19:13:54 +00:00
parent 789e0dffd0
commit dee70e8daa
2 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -2,7 +2,7 @@
source 'http://rubygems.org'
# Require rails
gem 'rails', '3.2.8'
gem 'rails', '3.2.9'
# Require things which have moved to gems in ruby 1.9
gem 'bigdecimal', :platforms => :ruby_19

73
Gemfile.lock
View file

@ -2,31 +2,31 @@ GEM
remote: http://rubygems.org/
specs:
SystemTimer (1.2.3)
actionmailer (3.2.8)
actionpack (= 3.2.8)
actionmailer (3.2.9)
actionpack (= 3.2.9)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
activeresource (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
@ -39,7 +39,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.3.3)
coffee-script-source (1.4.0)
composite_primary_keys (5.0.9)
activerecord (~> 3.2.0, >= 3.2.8)
deadlock_retry (1.2.0)
@ -74,8 +74,8 @@ GEM
treetop (~> 1.4.8)
memcached (1.4.6)
mime-types (1.19)
minitest (4.1.0)
multi_json (1.3.6)
minitest (4.2.0)
multi_json (1.3.7)
multipart-post (1.1.5)
nokogiri (1.5.5)
oauth (0.4.7)
@ -111,38 +111,39 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
rails (3.2.9)
actionmailer (= 3.2.9)
actionpack (= 3.2.9)
activerecord (= 3.2.9)
activeresource (= 3.2.9)
activesupport (= 3.2.9)
bundler (~> 1.0)
railties (= 3.2.8)
rails-i18n (0.6.6)
railties (= 3.2.9)
rails-i18n (0.7.0)
i18n (~> 0.5)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
railties (3.2.9)
actionpack (= 3.2.9)
activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rake (10.0.0)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.2.2)
rinku (1.7.2)
ruby-openid (2.2.1)
ruby-openid (2.2.2)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.2.1)
sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sprockets (2.1.3)
sprockets (2.2.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.10.2)
@ -150,10 +151,10 @@ GEM
thor (0.16.0)
tilt (1.3.3)
timecop (0.5.3)
treetop (1.4.11)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@ -184,7 +185,7 @@ DEPENDENCIES
paperclip (~> 2.0)
pg
rack-cors
rails (= 3.2.8)
rails (= 3.2.9)
rails-i18n (>= 0.6.3)
redcarpet
rinku (>= 1.2.2)