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 dependency to version 3.1.0.rc6

This commit is contained in:
Erik Michaels-Ober 2011-08-16 17:49:27 -07:00
parent e0854a9dd4
commit c9ca5a008a
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -1,6 +1,7 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.1.0.rc5' gem 'rails', '~> 3.1.0.rc6'
gem 'arel' gem 'arel'
gem 'devise' gem 'devise'
gem 'geokit' gem 'geokit'

56
Gemfile.lock
View File

@ -10,37 +10,37 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.1.0.rc5) actionmailer (3.1.0.rc6)
actionpack (= 3.1.0.rc5) actionpack (= 3.1.0.rc6)
mail (~> 2.3.0) mail (~> 2.3.0)
actionpack (3.1.0.rc5) actionpack (3.1.0.rc6)
activemodel (= 3.1.0.rc5) activemodel (= 3.1.0.rc6)
activesupport (= 3.1.0.rc5) activesupport (= 3.1.0.rc6)
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.1) rack (~> 1.3.2)
rack-cache (~> 1.0.2) 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.12) sprockets (~> 2.0.0.beta.12)
activemodel (3.1.0.rc5) activemodel (3.1.0.rc6)
activesupport (= 3.1.0.rc5) activesupport (= 3.1.0.rc6)
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.rc5) activerecord (3.1.0.rc6)
activemodel (= 3.1.0.rc5) activemodel (= 3.1.0.rc6)
activesupport (= 3.1.0.rc5) activesupport (= 3.1.0.rc6)
arel (~> 2.1.4) arel (~> 2.2.1)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.1.0.rc5) activeresource (3.1.0.rc6)
activemodel (= 3.1.0.rc5) activemodel (= 3.1.0.rc6)
activesupport (= 3.1.0.rc5) activesupport (= 3.1.0.rc6)
activesupport (3.1.0.rc5) activesupport (3.1.0.rc6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6) addressable (2.2.6)
arel (2.1.4) arel (2.2.1)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
bcrypt-ruby (2.1.4-java) bcrypt-ruby (2.1.4-java)
bouncy-castle-java (1.5.0146.1) bouncy-castle-java (1.5.0146.1)
@ -79,17 +79,17 @@ GEM
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.0.rc5) rails (3.1.0.rc6)
actionmailer (= 3.1.0.rc5) actionmailer (= 3.1.0.rc6)
actionpack (= 3.1.0.rc5) actionpack (= 3.1.0.rc6)
activerecord (= 3.1.0.rc5) activerecord (= 3.1.0.rc6)
activeresource (= 3.1.0.rc5) activeresource (= 3.1.0.rc6)
activesupport (= 3.1.0.rc5) activesupport (= 3.1.0.rc6)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.0.rc5) railties (= 3.1.0.rc6)
railties (3.1.0.rc5) railties (3.1.0.rc6)
actionpack (= 3.1.0.rc5) actionpack (= 3.1.0.rc6)
activesupport (= 3.1.0.rc5) activesupport (= 3.1.0.rc6)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -134,7 +134,7 @@ DEPENDENCIES
haml (~> 3.2.0.alpha) haml (~> 3.2.0.alpha)
jruby-openssl jruby-openssl
pg pg
rails (= 3.1.0.rc5) rails (~> 3.1.0.rc6)
rails_admin! rails_admin!
simplecov simplecov
sqlite3 sqlite3