| Age | Commit message (Collapse) | Author |
|---|
|
|
|
find_record User will return a stubbed user record and make sure User.find_by_id(user.id) returns the same so it can be used in controllers.
|
|
|
|
|
|
|
|
Travis CI does not seem to have the admin user records. Let's not depend on them and just stub the admin user.
|
|
|
|
I changed the permissions a little to be more consistent.
Now:
* admins can edit users
* users can destroy themselves.
There's no ui for either of them but theoretically they could. Not sure this is what we want though.
|
|
|
|
|
|
|
|
|
|
Conflicts:
users/app/views/sessions/_nav.html.haml
|
|
|
|
|
|
|
|
|
|
Also added #assert_json_error to tests.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* translating error messages
* not caching login and password in js anymore
* catching non responses
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/assets/javascripts/application.js
ui_dependencies.rb
|
|
|
|
|
|
|
|
Conflicts:
help/test/functional/tickets_controller_test.rb
users/test/functional/application_controller_test.rb
users/test/support/auth_test_helper.rb
|
|
|
|
Conflicts:
Gemfile.lock
|
|
|
|
|
|
|
|
|
|
also commented the sessions controller test a bit and fixed it
|
|
|
|
Conflicts:
users/app/assets/javascripts/srp
|
|
|
|
|
|
|
|
|
|
|
