mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Bump rails version to 4.0.0.rc1, closes #2399
This commit is contained in:
Carlos Antonio da Silva
parent
c618969677
commit
e8d1c9ca23
2 changed files with 49 additions and 55 deletions
2
Gemfile
2
Gemfile
|
|
@ -2,7 +2,7 @@ source "https://rubygems.org"
|
|||
|
||||
gemspec
|
||||
|
||||
gem "rails", "~> 4.0.0.beta", github: "rails/rails", branch: "master"
|
||||
gem "rails", "~> 4.0.0.rc1"
|
||||
gem "omniauth", "~> 1.0.0"
|
||||
gem "omniauth-oauth2", "~> 1.0.0"
|
||||
gem "rdoc"
|
||||
|
|
|
|||
102
Gemfile.lock
102
Gemfile.lock
|
|
@ -1,56 +1,14 @@
|
|||
GIT
|
||||
remote: git://github.com/mongoid/mongoid.git
|
||||
revision: 4a931ca105fddf59cc2f8619e973233376cf4b67
|
||||
revision: f703270f44021fb9e7411d8ed113159282e726c6
|
||||
branch: master
|
||||
specs:
|
||||
mongoid (4.0.0)
|
||||
activemodel (~> 4.0.0.beta)
|
||||
activemodel (~> 4.0.0.rc1)
|
||||
moped (~> 1.4.2)
|
||||
origin (~> 1.0)
|
||||
tzinfo (~> 0.3.22)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails/rails.git
|
||||
revision: 67bb49b69e1f10c2b35a53a645ed98a028375f1d
|
||||
branch: master
|
||||
specs:
|
||||
actionmailer (4.0.0.beta1)
|
||||
actionpack (= 4.0.0.beta1)
|
||||
mail (~> 2.5.3)
|
||||
actionpack (4.0.0.beta1)
|
||||
activesupport (= 4.0.0.beta1)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.0.beta1)
|
||||
activesupport (= 4.0.0.beta1)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.0.beta1)
|
||||
activemodel (= 4.0.0.beta1)
|
||||
activerecord-deprecated_finders (~> 0.0.3)
|
||||
activesupport (= 4.0.0.beta1)
|
||||
arel (~> 4.0.0.beta2)
|
||||
activesupport (4.0.0.beta1)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
rails (4.0.0.beta1)
|
||||
actionmailer (= 4.0.0.beta1)
|
||||
actionpack (= 4.0.0.beta1)
|
||||
activerecord (= 4.0.0.beta1)
|
||||
activesupport (= 4.0.0.beta1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.0.beta1)
|
||||
sprockets-rails (~> 2.0.0.rc3)
|
||||
railties (4.0.0.beta1)
|
||||
actionpack (= 4.0.0.beta1)
|
||||
activesupport (= 4.0.0.beta1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
|
|
@ -63,9 +21,32 @@ PATH
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activerecord-deprecated_finders (0.0.3)
|
||||
arel (4.0.0.beta2)
|
||||
atomic (1.1.7)
|
||||
actionmailer (4.0.0.rc1)
|
||||
actionpack (= 4.0.0.rc1)
|
||||
mail (~> 2.5.3)
|
||||
actionpack (4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.0.rc1)
|
||||
activemodel (= 4.0.0.rc1)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.2)
|
||||
activesupport (4.0.0.rc1)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
arel (4.0.0)
|
||||
atomic (1.1.8)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
erubis (2.7.0)
|
||||
|
|
@ -83,8 +64,8 @@ GEM
|
|||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.1)
|
||||
mime-types (1.22)
|
||||
minitest (4.7.1)
|
||||
mime-types (1.23)
|
||||
minitest (4.7.4)
|
||||
mocha (0.13.3)
|
||||
metaclass (~> 0.0.1)
|
||||
moped (1.4.5)
|
||||
|
|
@ -108,7 +89,7 @@ GEM
|
|||
omniauth-openid (1.0.1)
|
||||
omniauth (~> 1.0)
|
||||
rack-openid (~> 1.3.1)
|
||||
origin (1.0.11)
|
||||
origin (1.1.0)
|
||||
orm_adapter (0.4.0)
|
||||
polyglot (0.3.3)
|
||||
rack (1.5.2)
|
||||
|
|
@ -117,16 +98,29 @@ GEM
|
|||
ruby-openid (>= 2.1.8)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.0.rc1)
|
||||
actionmailer (= 4.0.0.rc1)
|
||||
actionpack (= 4.0.0.rc1)
|
||||
activerecord (= 4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.0.rc1)
|
||||
sprockets-rails (~> 2.0.0.rc4)
|
||||
railties (4.0.0.rc1)
|
||||
actionpack (= 4.0.0.rc1)
|
||||
activesupport (= 4.0.0.rc1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.0.4)
|
||||
rdoc (4.0.1)
|
||||
json (~> 1.4)
|
||||
ruby-openid (2.2.3)
|
||||
sprockets (2.9.2)
|
||||
sprockets (2.9.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.0.0.rc3)
|
||||
sprockets-rails (2.0.0.rc4)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
|
|
@ -134,7 +128,7 @@ GEM
|
|||
thor (0.18.1)
|
||||
thread_safe (0.1.0)
|
||||
atomic
|
||||
tilt (1.3.7)
|
||||
tilt (1.4.0)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
|
|
@ -160,7 +154,7 @@ DEPENDENCIES
|
|||
omniauth-facebook
|
||||
omniauth-oauth2 (~> 1.0.0)
|
||||
omniauth-openid (~> 1.0.1)
|
||||
rails (~> 4.0.0.beta)!
|
||||
rails (~> 4.0.0.rc1)
|
||||
rdoc
|
||||
sqlite3
|
||||
webrat (= 0.7.2)
|
||||
|
|
|
|||
Loading…
Reference in a new issue