projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a76b55
f9578ab
)
Merge branch '2388-bogus-token-error-page'
author
Tom Clegg <tom@curoverse.com>
Tue, 15 Apr 2014 03:56:04 +0000
(23:56 -0400)
committer
Tom Clegg <tom@curoverse.com>
Tue, 15 Apr 2014 03:56:04 +0000
(23:56 -0400)
closes #2388
1
2
services/api/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/functional/arvados/v1/users_controller_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/application_controller.rb
Simple merge
diff --cc
services/api/test/functional/arvados/v1/users_controller_test.rb
Simple merge
projects / arvados.git / commitdiff