Age | Commit message (Collapse) | Author |
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/assets/javascripts/application.js
ui_dependencies.rb
|
|
|
|
|
|
info for when creating unauthenticated tickets, redirecting to index when closing a ticket, fix default select for ticket filtering.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
.gitignore
|
|
|
|
Conflicts:
.gitignore
|
|
|
|
|
|
|
|
we're merging repositories into one
|