diff options
author | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
commit | e1a004e2b24c2c235452469abfefa033e24435b2 (patch) | |
tree | a4b1c89a5aa4d5ccb3c17521499c999dedd5842d /users/app/views/users/_user.html.haml | |
parent | 4793c2b770fcb018303b7ab226b75cc218364327 (diff) | |
parent | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff) |
Merge branch 'master' into help_develop
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
Diffstat (limited to 'users/app/views/users/_user.html.haml')
-rw-r--r-- | users/app/views/users/_user.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/users/app/views/users/_user.html.haml b/users/app/views/users/_user.html.haml index 5eb7941..7db0041 100644 --- a/users/app/views/users/_user.html.haml +++ b/users/app/views/users/_user.html.haml @@ -2,6 +2,9 @@ %td= user.login %td= time_ago_in_words(user.created_at) + " ago" %td + = link_to edit_user_path(user), :class => "btn btn-mini btn-primary" do + %i.icon-edit.icon-white + Edit = link_to user_path(user), :method => :delete, :class => "btn btn-danger btn-mini" do %i.icon-remove.icon-white Remove |