[ARVADOS] updated: b29fdd276087f72fdbda2eb55746ffcc00e18ca1

[Git user]

Summary of changes:
 apps/workbench/app/assets/javascripts/application.js      |  1 +
 .../workbench/app/assets/javascripts/models/session_db.js |  2 +-
 .../app/views/jobs/_rerun_job_with_options_popup.html.erb | 15 +++++++++++----
 apps/workbench/config/application.default.yml             |  2 +-
 apps/workbench/npm_packages                               |  1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

       via  b29fdd276087f72fdbda2eb55746ffcc00e18ca1 (commit)
       via  526f3e54133c863b78314924a485d327eb9ba392 (commit)
       via  582ba85e4e0934ef82c42a0f29bed8c14b22f1b6 (commit)
       via  ba244db1c467e168486394b7cfe78e035fc084b5 (commit)
      from  d047c1cb9ceecb6e324adf102e5e38e11fe698e1 (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 b29fdd276087f72fdbda2eb55746ffcc00e18ca1
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 30 11:27:02 2017 -0400

    4878: Fix whitespace and missing </p> tag.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb b/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
index bf31e3b..ba68106 100644
--- a/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
+++ b/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
@@ -22,10 +22,17 @@ SPDX-License-Identifier: AGPL-3.0 %>
         </div>
 
         <div class="modal-body">
-          <p> If this job is part of a pipeline, that pipeline would not know about the new job you are running.
-              If you want to update your pipeline results, please re-run the pipeline instead.
-          <p> The inputs and parameters will be the same as the current job.
-              Thus, the new job will not reflect any changes made to the pipeline that initiated this job. </p>
+          <p>
+            If this job is part of a pipeline, that pipeline would not
+            know about the new job you are running.  If you want to
+            update your pipeline results, please re-run the pipeline
+            instead.
+          </p>
+          <p>
+            The inputs and parameters will be the same as the current
+            job.  Thus, the new job will not reflect any changes made
+            to the pipeline that initiated this job.
+          </p>
           <div style="padding-left: 1em">
             <% if (@job.supplied_script_version.blank? or
                    (@job.supplied_script_version == @job.script_version)) %>

commit 526f3e54133c863b78314924a485d327eb9ba392
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 30 11:19:26 2017 -0400

    12033: Avoid startsWith(), unsupported in test suite.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/models/session_db.js b/apps/workbench/app/assets/javascripts/models/session_db.js
index 13409d9..8330a68 100644
--- a/apps/workbench/app/assets/javascripts/models/session_db.js
+++ b/apps/workbench/app/assets/javascripts/models/session_db.js
@@ -84,7 +84,7 @@ window.SessionDB = function() {
             // If there's a token and baseURL in the location bar (i.e.,
             // we just landed here after a successful login), save it and
             // scrub the location bar.
-            if (!document.location.search.startsWith('?'))
+            if (document.location.search[0] != '?')
                 return
             var params = {}
             document.location.search.slice(1).split('&').map(function(kv) {

commit 582ba85e4e0934ef82c42a0f29bed8c14b22f1b6
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 30 11:15:16 2017 -0400

    12033: Disable/hide multi-site search by default.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 83164d1..eda6d0a 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -308,4 +308,4 @@ common:
   #
   # Example:
   # multi_site_search: https://workbench.qr1hi.arvadosapi.com/collections/multisite
-  multi_site_search: true
+  multi_site_search: false

commit ba244db1c467e168486394b7cfe78e035fc084b5
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 30 11:14:33 2017 -0400

    12033: Add Object.assign polyfill for test suite.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index aa589ed..bba2f9d 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -35,6 +35,7 @@
 //= require mithril/stream/stream
 //= require_tree .
 
+Es6ObjectAssign.polyfill()
 window.m = Object.assign(window.Mithril, {stream: window.m.stream})
 
 jQuery(function($){
diff --git a/apps/workbench/npm_packages b/apps/workbench/npm_packages
index 56acf9f..cab83b3 100644
--- a/apps/workbench/npm_packages
+++ b/apps/workbench/npm_packages
@@ -8,3 +8,4 @@
 npm 'browserify', require: false, development: true
 
 npm 'mithril'
+npm 'es6-object-assign'

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


hooks/post-receive
--