mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Ensure routes works for all rails 3 versions.
This commit is contained in:
parent
1e17b6a5ec
commit
c96e17dd8d
2 changed files with 33 additions and 33 deletions
58
Gemfile.lock
58
Gemfile.lock
|
@ -12,44 +12,44 @@ GIT
|
|||
PATH
|
||||
remote: /Users/jose/Work/github/rails
|
||||
specs:
|
||||
actionmailer (3.0.0.rc)
|
||||
actionpack (= 3.0.0.rc)
|
||||
actionmailer (3.0.0.rc2)
|
||||
actionpack (= 3.0.0.rc2)
|
||||
mail (~> 2.2.5)
|
||||
actionpack (3.0.0.rc)
|
||||
activemodel (= 3.0.0.rc)
|
||||
activesupport (= 3.0.0.rc)
|
||||
actionpack (3.0.0.rc2)
|
||||
activemodel (= 3.0.0.rc2)
|
||||
activesupport (= 3.0.0.rc2)
|
||||
builder (~> 2.1.2)
|
||||
erubis (~> 2.6.6)
|
||||
i18n (~> 0.4.1)
|
||||
rack (~> 1.2.1)
|
||||
rack-mount (~> 0.6.10)
|
||||
rack-mount (~> 0.6.12)
|
||||
rack-test (~> 0.5.4)
|
||||
tzinfo (~> 0.3.23)
|
||||
activemodel (3.0.0.rc)
|
||||
activesupport (= 3.0.0.rc)
|
||||
activemodel (3.0.0.rc2)
|
||||
activesupport (= 3.0.0.rc2)
|
||||
builder (~> 2.1.2)
|
||||
i18n (~> 0.4.1)
|
||||
activerecord (3.0.0.rc)
|
||||
activemodel (= 3.0.0.rc)
|
||||
activesupport (= 3.0.0.rc)
|
||||
arel (~> 0.4.0)
|
||||
activerecord (3.0.0.rc2)
|
||||
activemodel (= 3.0.0.rc2)
|
||||
activesupport (= 3.0.0.rc2)
|
||||
arel (~> 1.0.0.rc1)
|
||||
tzinfo (~> 0.3.23)
|
||||
activeresource (3.0.0.rc)
|
||||
activemodel (= 3.0.0.rc)
|
||||
activesupport (= 3.0.0.rc)
|
||||
activesupport (3.0.0.rc)
|
||||
rails (3.0.0.rc)
|
||||
actionmailer (= 3.0.0.rc)
|
||||
actionpack (= 3.0.0.rc)
|
||||
activerecord (= 3.0.0.rc)
|
||||
activeresource (= 3.0.0.rc)
|
||||
activesupport (= 3.0.0.rc)
|
||||
bundler (>= 1.0.0.rc.2)
|
||||
railties (= 3.0.0.rc)
|
||||
railties (3.0.0.rc)
|
||||
actionpack (= 3.0.0.rc)
|
||||
activesupport (= 3.0.0.rc)
|
||||
rake (>= 0.8.3)
|
||||
activeresource (3.0.0.rc2)
|
||||
activemodel (= 3.0.0.rc2)
|
||||
activesupport (= 3.0.0.rc2)
|
||||
activesupport (3.0.0.rc2)
|
||||
rails (3.0.0.rc2)
|
||||
actionmailer (= 3.0.0.rc2)
|
||||
actionpack (= 3.0.0.rc2)
|
||||
activerecord (= 3.0.0.rc2)
|
||||
activeresource (= 3.0.0.rc2)
|
||||
activesupport (= 3.0.0.rc2)
|
||||
bundler (>= 1.0.0.rc.6)
|
||||
railties (= 3.0.0.rc2)
|
||||
railties (3.0.0.rc2)
|
||||
actionpack (= 3.0.0.rc2)
|
||||
activesupport (= 3.0.0.rc2)
|
||||
rake (>= 0.8.4)
|
||||
thor (~> 0.14.0)
|
||||
|
||||
GEM
|
||||
|
@ -61,7 +61,7 @@ GEM
|
|||
activerecord-jdbc-adapter (= 0.9.7)
|
||||
jdbc-sqlite3 (>= 3.6.3.054)
|
||||
addressable (2.1.2)
|
||||
arel (0.4.0)
|
||||
arel (1.0.0.rc1)
|
||||
activesupport (>= 3.0.0.beta)
|
||||
bcrypt-ruby (2.1.2)
|
||||
bson (1.0.4)
|
||||
|
|
|
@ -198,10 +198,10 @@ module ActionDispatch::Routing
|
|||
protected
|
||||
|
||||
def devise_session(mapping, controllers) #:nodoc:
|
||||
scope :controller => controllers[:sessions], :as => :session do
|
||||
get :new, :path => mapping.path_names[:sign_in]
|
||||
post :create, :path => mapping.path_names[:sign_in], :as => ""
|
||||
match :destroy, :path => mapping.path_names[:sign_out], :via => mapping.sign_out_via
|
||||
resource :session, :only => [], :controller => controllers[:sessions], :path => "" do
|
||||
get :new, :path => mapping.path_names[:sign_in], :as => "new"
|
||||
post :create, :path => mapping.path_names[:sign_in]
|
||||
match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy", :via => mapping.sign_out_via
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue