Merge branch '2388-bogus-token-error-page'
authorTom Clegg <tom@curoverse.com>
Tue, 15 Apr 2014 03:56:04 +0000 (23:56 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 15 Apr 2014 03:56:04 +0000 (23:56 -0400)
commitbb45025e80abc00f8da524d9a78c0bab976d4f3a
tree530729b1ebeb7eee8f9ff7ce33aa7324771cafb9
parent3a76b55556740564b8cfb44c7e430975cca6bf96
parentf9578ab5cacc544dc1a5c3fa0fbea5fd627efdf9
Merge branch '2388-bogus-token-error-page'

closes #2388
services/api/app/controllers/application_controller.rb
services/api/test/functional/arvados/v1/users_controller_test.rb