[ARVADOS] updated: 1.2.0-156-g8d73164d5

[Git user]

Summary of changes:
 .../app/assets/javascripts/models/session_db.js    | 15 ++++++--
 .../controllers/collections_controller_test.rb     | 40 ++++++++++------------
 .../workbench/test/integration/collections_test.rb |  2 +-
 apps/workbench/test/integration/jobs_test.rb       |  2 +-
 apps/workbench/test/integration_helper.rb          |  2 +-
 apps/workbench/test/test_helper.rb                 | 13 +++++--
 .../api/app/controllers/application_controller.rb  | 13 +++++--
 .../app/controllers/user_sessions_controller.rb    |  2 +-
 services/api/test/test_helper.rb                   | 10 +++---
 9 files changed, 61 insertions(+), 38 deletions(-)

       via  8d73164d5ca50e7af1b3752b4251eaf9f11a9fc8 (commit)
       via  7bd15984bcce853fa3f9cd18b15537d8f2514ac6 (commit)
       via  d3973d7df59bffccb012eaff0bf1c11a23fb5a06 (commit)
       via  269aba16336d6e9dcf80239465cfcfb9a841a4a9 (commit)
       via  4503336797b79519f8c480af39fb72538191038a (commit)
      from  047cd9bb7f3c0ecc8ccceddea02a51918b0d2819 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8d73164d5ca50e7af1b3752b4251eaf9f11a9fc8
Merge: 047cd9bb7 7bd15984b
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Oct 9 15:20:38 2018 -0400

    Merge branch '14196-api-v2-tokens' refs #14196
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 7bd15984bcce853fa3f9cd18b15537d8f2514ac6
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Oct 9 15:19:31 2018 -0400

    14196: Revert debug change to Access-Control-Max-Age
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index d9990b39b..a0555d13d 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -420,8 +420,7 @@ class ApplicationController < ActionController::Base
     response.headers['Access-Control-Allow-Origin'] = '*'
     response.headers['Access-Control-Allow-Methods'] = 'GET, HEAD, PUT, POST, DELETE'
     response.headers['Access-Control-Allow-Headers'] = 'Authorization, Content-Type'
-    #response.headers['Access-Control-Max-Age'] = '86486400'
-    response.headers['Access-Control-Max-Age'] = '1'
+    response.headers['Access-Control-Max-Age'] = '86486400'
   end
 
   def respond_with_json_by_default

-----------------------------------------------------------------------


hooks/post-receive
--