| 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
|
|
Conflicts:
Gemfile.lock
|
|
|
|
|
|
|
|
|
|
Conflicts:
users/app/assets/javascripts/srp
|
|
|
|
|
|
|
|
|
|
|
|
ID will be the random string for the secret URL.
Tickets created when user was unauthenticated will be viewable by anybody who knows the URL.
|
|
|
|
|
|
|
|
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
|
|
|
|
and initial way to close tickets.
|
|
config file.
|
|
Conflicts:
users/app/controllers/application_controller.rb
users/app/models/user.rb
|
|
|
|
|
|
|
|
|
|
|
|
still need to translate these
|
|
without rails_warden the failure app action was not getting set properly.
|
|
currently failing because we are not setting the content-type header.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also removed a few hooks to User.current. Will replace with current_user
|
|
Conflicts:
.gitignore
|
|
|
|
|
