Merge branch 'master' into 11453-federated-tokens
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 6 Nov 2017 22:12:34 +0000 (17:12 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 6 Nov 2017 22:12:34 +0000 (17:12 -0500)
commit1e3f8ceebd90058e902494fae84b1fd57ac6693b
treeffc61f8d8de40dedd761f608d5ebf8fdfb559a2c
parent530b25ab14999d0407e39e1bf0a0e5595da2a028
parentd493d06b4b93b87c10c59954e47a18d85db13150
Merge branch 'master' into 11453-federated-tokens

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/api/app/controllers/application_controller.rb
services/api/app/middlewares/arvados_api_token.rb