diff options
| author | jessib <jessib@riseup.net> | 2014-02-10 10:27:52 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-02-10 10:27:52 -0800 |
| commit | b6ef51277b4e6d65cfda15f0124ae4f222f7f241 (patch) | |
| tree | da7eb2d3a3a648be0be519aae23f997f248ba320 /users/app/controllers/users_controller.rb | |
| parent | bcdde2f6bfb4ed3a1535bd2e50ab47529a9141e2 (diff) | |
| parent | b4719619aabbe9ebf74563b62e1eb8e4fb248c21 (diff) | |
Merge pull request #138 from azul/feature/token-only-api-auth
Feature/token only api auth
Diffstat (limited to 'users/app/controllers/users_controller.rb')
| -rw-r--r-- | users/app/controllers/users_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index a5461cd..6b32d49 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -4,9 +4,9 @@ class UsersController < UsersBaseController - before_filter :authorize, :only => [:show, :edit, :update, :destroy] + before_filter :require_login, :except => [:new] + before_filter :require_admin, :only => [:index, :deactivate, :enable] before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable] - before_filter :authorize_admin, :only => [:index, :deactivate, :enable] respond_to :html |