Update rails dependency to version 3.1.0.rc4
This commit is contained in:
parent
1daecf41a1
commit
9cb73ad25e
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'rails', '3.1.0.rc3'
|
||||
gem 'rails', '3.1.0.rc4'
|
||||
gem 'coffee-script'
|
||||
gem 'devise'
|
||||
gem 'geokit'
|
||||
|
|
52
Gemfile.lock
52
Gemfile.lock
|
@ -2,12 +2,12 @@ GEM
|
|||
remote: http://rubygems.org/
|
||||
specs:
|
||||
ZenTest (4.5.0)
|
||||
actionmailer (3.1.0.rc3)
|
||||
actionpack (= 3.1.0.rc3)
|
||||
actionmailer (3.1.0.rc4)
|
||||
actionpack (= 3.1.0.rc4)
|
||||
mail (~> 2.3.0)
|
||||
actionpack (3.1.0.rc3)
|
||||
activemodel (= 3.1.0.rc3)
|
||||
activesupport (= 3.1.0.rc3)
|
||||
actionpack (3.1.0.rc4)
|
||||
activemodel (= 3.1.0.rc4)
|
||||
activesupport (= 3.1.0.rc4)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
i18n (~> 0.6)
|
||||
|
@ -17,20 +17,20 @@ GEM
|
|||
rack-test (~> 0.6.0)
|
||||
sprockets (~> 2.0.0.beta.10)
|
||||
tzinfo (~> 0.3.27)
|
||||
activemodel (3.1.0.rc3)
|
||||
activesupport (= 3.1.0.rc3)
|
||||
activemodel (3.1.0.rc4)
|
||||
activesupport (= 3.1.0.rc4)
|
||||
bcrypt-ruby (~> 2.1.4)
|
||||
builder (~> 3.0.0)
|
||||
i18n (~> 0.6)
|
||||
activerecord (3.1.0.rc3)
|
||||
activemodel (= 3.1.0.rc3)
|
||||
activesupport (= 3.1.0.rc3)
|
||||
activerecord (3.1.0.rc4)
|
||||
activemodel (= 3.1.0.rc4)
|
||||
activesupport (= 3.1.0.rc4)
|
||||
arel (~> 2.1.1)
|
||||
tzinfo (~> 0.3.27)
|
||||
activeresource (3.1.0.rc3)
|
||||
activemodel (= 3.1.0.rc3)
|
||||
activesupport (= 3.1.0.rc3)
|
||||
activesupport (3.1.0.rc3)
|
||||
activeresource (3.1.0.rc4)
|
||||
activemodel (= 3.1.0.rc4)
|
||||
activesupport (= 3.1.0.rc4)
|
||||
activesupport (3.1.0.rc4)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.2.6)
|
||||
ansi (1.2.5)
|
||||
|
@ -75,21 +75,23 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.0)
|
||||
rack (>= 1.0)
|
||||
rails (3.1.0.rc3)
|
||||
actionmailer (= 3.1.0.rc3)
|
||||
actionpack (= 3.1.0.rc3)
|
||||
activerecord (= 3.1.0.rc3)
|
||||
activeresource (= 3.1.0.rc3)
|
||||
activesupport (= 3.1.0.rc3)
|
||||
rails (3.1.0.rc4)
|
||||
actionmailer (= 3.1.0.rc4)
|
||||
actionpack (= 3.1.0.rc4)
|
||||
activerecord (= 3.1.0.rc4)
|
||||
activeresource (= 3.1.0.rc4)
|
||||
activesupport (= 3.1.0.rc4)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.1.0.rc3)
|
||||
railties (3.1.0.rc3)
|
||||
actionpack (= 3.1.0.rc3)
|
||||
activesupport (= 3.1.0.rc3)
|
||||
railties (= 3.1.0.rc4)
|
||||
railties (3.1.0.rc4)
|
||||
actionpack (= 3.1.0.rc4)
|
||||
activesupport (= 3.1.0.rc4)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (~> 0.14.6)
|
||||
rake (0.9.2)
|
||||
rdoc (3.6.1)
|
||||
sass (3.1.2)
|
||||
simplecov (0.4.2)
|
||||
simplecov-html (~> 0.4.4)
|
||||
|
@ -129,7 +131,7 @@ DEPENDENCIES
|
|||
haml
|
||||
jruby-openssl (~> 0.7)
|
||||
pg
|
||||
rails (= 3.1.0.rc3)
|
||||
rails (= 3.1.0.rc4)
|
||||
sass
|
||||
simplecov
|
||||
sqlite3
|
||||
|
|
Loading…
Reference in New Issue