[ARVADOS] updated: 1.1.0-147-g2f83263

[Git user]

Summary of changes:
 apps/workbench/app/assets/javascripts/models/session_db.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  2f83263d2978918561355b5b3b2bdaa05b38023f (commit)
      from  cf6ebed6cb9f2cd5e2ef15f8ea02d5d4e3458306 (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 2f83263d2978918561355b5b3b2bdaa05b38023f
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Nov 22 18:34:54 2017 -0300

    12519: Remove trailing slash when guessing the workbench url.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima 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 01b0d72..ad9ad18 100644
--- a/apps/workbench/app/assets/javascripts/models/session_db.js
+++ b/apps/workbench/app/assets/javascripts/models/session_db.js
@@ -135,7 +135,9 @@ window.SessionDB = function() {
             // the host part of apihostport is an IPv4 or [IPv6]
             // address.
             if (!session.baseURL.match('://(\\[|\\d+\\.\\d+\\.\\d+\\.\\d+[:/])'))
-                return session.baseURL.replace('://', '://workbench.')
+                var wbUrl = session.baseURL.replace('://', '://workbench.')
+                // Remove the trailing slash, if it's there.
+                return wbUrl.slice(-1) == '/' ? wbUrl.slice(0, -1) : wbUrl
             return null
         },
         // Return a m.stream that will get fulfilled with the

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


hooks/post-receive
--