Update rails dependency to version 3.1.0.rc6
This commit is contained in:
parent
e0854a9dd4
commit
c9ca5a008a
3
Gemfile
3
Gemfile
|
@ -1,6 +1,7 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'rails', '3.1.0.rc5'
|
||||
gem 'rails', '~> 3.1.0.rc6'
|
||||
|
||||
gem 'arel'
|
||||
gem 'devise'
|
||||
gem 'geokit'
|
||||
|
|
56
Gemfile.lock
56
Gemfile.lock
|
@ -10,37 +10,37 @@ GIT
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.1.0.rc5)
|
||||
actionpack (= 3.1.0.rc5)
|
||||
actionmailer (3.1.0.rc6)
|
||||
actionpack (= 3.1.0.rc6)
|
||||
mail (~> 2.3.0)
|
||||
actionpack (3.1.0.rc5)
|
||||
activemodel (= 3.1.0.rc5)
|
||||
activesupport (= 3.1.0.rc5)
|
||||
actionpack (3.1.0.rc6)
|
||||
activemodel (= 3.1.0.rc6)
|
||||
activesupport (= 3.1.0.rc6)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
i18n (~> 0.6)
|
||||
rack (~> 1.3.1)
|
||||
rack (~> 1.3.2)
|
||||
rack-cache (~> 1.0.2)
|
||||
rack-mount (~> 0.8.1)
|
||||
rack-test (~> 0.6.0)
|
||||
sprockets (~> 2.0.0.beta.12)
|
||||
activemodel (3.1.0.rc5)
|
||||
activesupport (= 3.1.0.rc5)
|
||||
activemodel (3.1.0.rc6)
|
||||
activesupport (= 3.1.0.rc6)
|
||||
bcrypt-ruby (~> 2.1.4)
|
||||
builder (~> 3.0.0)
|
||||
i18n (~> 0.6)
|
||||
activerecord (3.1.0.rc5)
|
||||
activemodel (= 3.1.0.rc5)
|
||||
activesupport (= 3.1.0.rc5)
|
||||
arel (~> 2.1.4)
|
||||
activerecord (3.1.0.rc6)
|
||||
activemodel (= 3.1.0.rc6)
|
||||
activesupport (= 3.1.0.rc6)
|
||||
arel (~> 2.2.1)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.1.0.rc5)
|
||||
activemodel (= 3.1.0.rc5)
|
||||
activesupport (= 3.1.0.rc5)
|
||||
activesupport (3.1.0.rc5)
|
||||
activeresource (3.1.0.rc6)
|
||||
activemodel (= 3.1.0.rc6)
|
||||
activesupport (= 3.1.0.rc6)
|
||||
activesupport (3.1.0.rc6)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.2.6)
|
||||
arel (2.1.4)
|
||||
arel (2.2.1)
|
||||
bcrypt-ruby (2.1.4)
|
||||
bcrypt-ruby (2.1.4-java)
|
||||
bouncy-castle-java (1.5.0146.1)
|
||||
|
@ -79,17 +79,17 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.1)
|
||||
rack (>= 1.0)
|
||||
rails (3.1.0.rc5)
|
||||
actionmailer (= 3.1.0.rc5)
|
||||
actionpack (= 3.1.0.rc5)
|
||||
activerecord (= 3.1.0.rc5)
|
||||
activeresource (= 3.1.0.rc5)
|
||||
activesupport (= 3.1.0.rc5)
|
||||
rails (3.1.0.rc6)
|
||||
actionmailer (= 3.1.0.rc6)
|
||||
actionpack (= 3.1.0.rc6)
|
||||
activerecord (= 3.1.0.rc6)
|
||||
activeresource (= 3.1.0.rc6)
|
||||
activesupport (= 3.1.0.rc6)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.1.0.rc5)
|
||||
railties (3.1.0.rc5)
|
||||
actionpack (= 3.1.0.rc5)
|
||||
activesupport (= 3.1.0.rc5)
|
||||
railties (= 3.1.0.rc6)
|
||||
railties (3.1.0.rc6)
|
||||
actionpack (= 3.1.0.rc6)
|
||||
activesupport (= 3.1.0.rc6)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
|
@ -134,7 +134,7 @@ DEPENDENCIES
|
|||
haml (~> 3.2.0.alpha)
|
||||
jruby-openssl
|
||||
pg
|
||||
rails (= 3.1.0.rc5)
|
||||
rails (~> 3.1.0.rc6)
|
||||
rails_admin!
|
||||
simplecov
|
||||
sqlite3
|
||||
|
|
Loading…
Reference in New Issue