diff options
| author | jessib <jessib@riseup.net> | 2012-11-12 10:48:40 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-11-12 10:48:40 -0800 |
| commit | 347c1d73c855cfad8c37e8a0bd98a60831151812 (patch) | |
| tree | 104c89712d9a1f7d7eefd49187a2f6bbc70a33ce /users/lib/leap_web_users/engine.rb | |
| parent | 67cb22d50193a58e4697549d9ce8a22e790a7a0d (diff) | |
| parent | fe8b49232d31681667badaaeff7aa4d0a40445ea (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
help/test/functional/tickets_controller_test.rb
users/test/functional/application_controller_test.rb
users/test/support/auth_test_helper.rb
Diffstat (limited to 'users/lib/leap_web_users/engine.rb')
| -rw-r--r-- | users/lib/leap_web_users/engine.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb index 9b7545e..7033576 100644 --- a/users/lib/leap_web_users/engine.rb +++ b/users/lib/leap_web_users/engine.rb @@ -1,8 +1,12 @@ # thou shall require all your dependencies in an engine. require "leap_web_core" require "leap_web_core/ui_dependencies" +require "rails_warden" require "ruby-srp" +require "warden/session_serializer" +require "warden/strategies/secure_remote_password" + module LeapWebUsers class Engine < ::Rails::Engine |