simply re-organize little piece of code (cleaning stuff)

This commit is contained in:
Didier Lafforgue 2012-06-10 01:31:10 +02:00
parent 6350652e4b
commit fbcda9cdd6
5 changed files with 23 additions and 17 deletions

View File

@ -113,10 +113,10 @@ GEM
sass (~> 3.1) sass (~> 3.1)
compass-rails (1.0.2) compass-rails (1.0.2)
compass (>= 0.12.0, < 0.14) compass (>= 0.12.0, < 0.14)
cucumber (1.2.0) cucumber (1.2.1)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.3) diff-lcs (>= 1.1.3)
gherkin (~> 2.10.0) gherkin (~> 2.11.0)
json (>= 1.4.6) json (>= 1.4.6)
cucumber-rails (1.3.0) cucumber-rails (1.3.0)
capybara (>= 1.1.2) capybara (>= 1.1.2)
@ -167,7 +167,7 @@ GEM
formtastic (2.0.2) formtastic (2.0.2)
rails (~> 3.0) rails (~> 3.0)
fssm (0.2.9) fssm (0.2.9)
gherkin (2.10.0) gherkin (2.11.0)
json (>= 1.4.6) json (>= 1.4.6)
haml (3.1.6) haml (3.1.6)
highline (1.6.12) highline (1.6.12)

View File

@ -1,7 +1,13 @@
Locomotive::Engine.routes.draw do Locomotive::Engine.routes.draw do
# authentication # authentication
devise_for :locomotive_account, :class_name => 'Locomotive::Account', :path => '', :path_prefix => nil, :failure_app => 'Locomotive::Devise::FailureApp',:controllers => { :sessions => 'locomotive/sessions', :passwords => 'locomotive/passwords' } devise_for :locomotive_account,
:class_name => 'Locomotive::Account',
:path => '',
:path_prefix => nil,
:failure_app => 'Locomotive::Devise::FailureApp',
:controllers => { :sessions => 'locomotive/sessions', :passwords => 'locomotive/passwords' }
devise_scope :locomotive_account do devise_scope :locomotive_account do
match '/' => 'sessions#new' match '/' => 'sessions#new'
delete 'signout' => 'sessions#destroy', :as => :destroy_locomotive_session delete 'signout' => 'sessions#destroy', :as => :destroy_locomotive_session

View File

@ -3,6 +3,7 @@ require 'mongoid/railtie'
require 'mongoid/tree' require 'mongoid/tree'
require 'devise' require 'devise'
require 'devise/orm/mongoid' require 'devise/orm/mongoid'
require 'devise-encryptable'
require 'kaminari' require 'kaminari'
require 'haml' require 'haml'
require 'liquid' require 'liquid'

View File

@ -1,2 +1 @@
# patches for devise here # patches for devise here
require 'devise-encryptable'