choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update rails to version 3.1.0.rc5

This commit is contained in:
Erik Michaels-Ober 2011-07-25 21:59:36 -07:00
parent 7e95341492
commit ecc8d14e12
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.1.0.rc4' gem 'rails', '3.1.0.rc5'
gem 'coffee-script' gem 'coffee-script'
gem 'devise' gem 'devise'
gem 'geokit' gem 'geokit'

63
Gemfile.lock
View File

@ -2,35 +2,34 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
ZenTest (4.6.0) ZenTest (4.6.0)
actionmailer (3.1.0.rc4) actionmailer (3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
mail (~> 2.3.0) mail (~> 2.3.0)
actionpack (3.1.0.rc4) actionpack (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6) i18n (~> 0.6)
rack (~> 1.3.0) rack (~> 1.3.1)
rack-cache (~> 1.0.1) rack-cache (~> 1.0.2)
rack-mount (~> 0.8.1) rack-mount (~> 0.8.1)
rack-test (~> 0.6.0) rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.10) sprockets (~> 2.0.0.beta.12)
tzinfo (~> 0.3.27) activemodel (3.1.0.rc5)
activemodel (3.1.0.rc4) activesupport (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4) bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6) i18n (~> 0.6)
activerecord (3.1.0.rc4) activerecord (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
arel (~> 2.1.1) arel (~> 2.1.4)
tzinfo (~> 0.3.27) tzinfo (~> 0.3.29)
activeresource (3.1.0.rc4) activeresource (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
activesupport (3.1.0.rc4) activesupport (3.1.0.rc5)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6) addressable (2.2.6)
ansi (1.3.0) ansi (1.3.0)
@ -67,7 +66,7 @@ GEM
orm_adapter (0.0.5) orm_adapter (0.0.5)
pg (0.11.0) pg (0.11.0)
polyglot (0.3.1) polyglot (0.3.1)
rack (1.3.1) rack (1.3.2)
rack-cache (1.0.2) rack-cache (1.0.2)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.1) rack-mount (0.8.1)
@ -76,17 +75,17 @@ GEM
rack rack
rack-test (0.6.0) rack-test (0.6.0)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.0.rc4) rails (3.1.0.rc5)
actionmailer (= 3.1.0.rc4) actionmailer (= 3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
activerecord (= 3.1.0.rc4) activerecord (= 3.1.0.rc5)
activeresource (= 3.1.0.rc4) activeresource (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.0.rc4) railties (= 3.1.0.rc5)
railties (3.1.0.rc4) railties (3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -132,7 +131,7 @@ DEPENDENCIES
haml (~> 3.2.0.alpha) haml (~> 3.2.0.alpha)
jruby-openssl jruby-openssl
pg pg
rails (= 3.1.0.rc4) rails (= 3.1.0.rc5)
simplecov simplecov
sqlite3 sqlite3
therubyracer therubyracer