Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
also commented the sessions controller test a bit and fixed it
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* once tested as helper
* once tested as @controller.send...
|
|
|
|
|
|
Also removed a few hooks to User.current. Will replace with current_user
|
|
handshake.to_json now returns what we want.
|
|
|
|
|
|
|
|
|
|
also changed the debug output so it helps creating tests for ruby-srp
|
|
|
|
|
|
except the final auth as this is still broken anyway
|
|
|
|
|