diff options
| author | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
| commit | 7d7741f7d26c3ae7ee1dc347a6b1a1142a3c2824 (patch) | |
| tree | 5ec11b9600d4330ec94f56dda779634cd7dcae1b /users/app/controllers | |
| parent | 2485527650c4832d764d318e91c10bafde8b8ae5 (diff) | |
| parent | b550cd14f33b9664fe6b547dc56107fae7d12caf (diff) | |
Merge branch 'master' into feature/unauthenticated_tickets
Conflicts:
help/app/views/tickets/_comment.html.haml
help/app/views/tickets/_new_comment.html.haml
Diffstat (limited to 'users/app/controllers')
| -rw-r--r-- | users/app/controllers/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 79de630..eb93fcb 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -2,7 +2,7 @@ class UsersController < ApplicationController skip_before_filter :verify_authenticity_token, :only => [:create] - before_filter :fetch_user, :only => [:edit, :update, :destroy] + before_filter :fetch_user, :only => [:show, :edit, :update, :destroy] before_filter :set_anchor, :only => [:edit, :update] before_filter :authorize_admin, :only => [:index] |