Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
app/assets/stylesheets/application.scss
ui_dependencies.rb
users/app/controllers/users_controller.rb
users/app/views/sessions/new.html.haml
users/app/views/users/edit.html.haml
users/app/views/users/new.html.haml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tests to reflect this.
|
|
|
|
|
|
|
|
|
|
index/search.
|
|
|
|
|
|
|
|
admins) or stay as a nested resource for a particular user (for normal users and when you visit the tickets list of a particular user).
|
|
|
|
|
|
separate controller, make users_controller html only and v1/users_controller json only.
|
|
validation.
|
|
|
|
|
|
|
|
localization.
|
|
|
|
can't get it working.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tests to reflect this.
|
|
|
|
|
|
|
|
|
|
index/search.
|