diff options
| author | jessib <jessib@riseup.net> | 2013-08-27 12:18:35 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-27 12:18:35 -0700 |
| commit | dc41ae0a3fb0a137e716d8ec63084b0ec3a7299b (patch) | |
| tree | c09fef161f105e7c03c35d1edcb2d257144cb97d /users/config/initializers | |
| parent | a87c750d1f12f15272beb117f8ee12ab711cc6d1 (diff) | |
| parent | e481b8cbc05a858674a59ef36d695973622f6b3a (diff) | |
Merge branch 'master' into billing_with_tests
Diffstat (limited to 'users/config/initializers')
| -rw-r--r-- | users/config/initializers/add_controller_methods.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/users/config/initializers/add_controller_methods.rb b/users/config/initializers/add_controller_methods.rb index 2579176..f572ecb 100644 --- a/users/config/initializers/add_controller_methods.rb +++ b/users/config/initializers/add_controller_methods.rb @@ -1,3 +1,4 @@ ActiveSupport.on_load(:application_controller) do include ControllerExtension::Authentication + include ControllerExtension::TokenAuthentication end |