[ARVADOS] updated: 232feac2fbd5310d48f9058848326457f88732cc

[Git user]

Summary of changes:
 .../app/assets/javascripts/components/collections.js          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

  discards  a78396a51ca56f0f8e7a973f1a3cf64cbfa55162 (commit)
       via  232feac2fbd5310d48f9058848326457f88732cc (commit)
       via  5c724cffa06b5c5a809e0f6cce194a3f012c7ba3 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a78396a51ca56f0f8e7a973f1a3cf64cbfa55162)
            \
             N -- N -- N (232feac2fbd5310d48f9058848326457f88732cc)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 232feac2fbd5310d48f9058848326457f88732cc
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 5 16:29:55 2017 -0400

    12033: Skip "show" btn if guessed workbench link is obviously wrong.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/collections.js b/apps/workbench/app/assets/javascripts/components/collections.js
index a2054c1..78a6c8e 100644
--- a/apps/workbench/app/assets/javascripts/components/collections.js
+++ b/apps/workbench/app/assets/javascripts/components/collections.js
@@ -47,7 +47,16 @@ window.CollectionsTable = {
             m('tbody', [
                 loader.items().map(function(item) {
                     return m('tr', [
-                        m('td', m('a.btn.btn-xs.btn-default', {href: item.session.baseURL.replace('://', '://workbench.')+'collections/'+item.uuid}, 'Show')),
+                        m('td', [
+                            // Guess workbench.{apihostport} is a
+                            // Workbench... unless the host part of
+                            // apihostport is an IPv4 or [IPv6]
+                            // address.
+                            item.session.baseURL.match('://(\\[|\\d+\\.\\d+\\.\\d+\\.\\d+[:/])') ? null :
+                                m('a.btn.btn-xs.btn-default', {
+                                    href: item.session.baseURL.replace('://', '://workbench.')+'collections/'+item.uuid,
+                                }, 'Show'),
+                        ]),
                         m('td.arvados-uuid', item.uuid),
                         m('td', item.name || '(unnamed)'),
                         m('td', m(LocalizedDateTime, {parse: item.modified_at})),

commit 5c724cffa06b5c5a809e0f6cce194a3f012c7ba3
Merge: b29fdd2 2ac6522
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 5 16:27:44 2017 -0400

    12033: Merge branch 'master' into 12033-multisite-search
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
--