[ARVADOS] updated: 1.2.0-185-ga83161aa6

[Git user]

Summary of changes:

  discards  cda46aeba30f4ec667aa20f8c5eb0e2fe52e51c5 (commit)
       via  a83161aa6c7d285cdddf9140051feeb51a56225d (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 (cda46aeba30f4ec667aa20f8c5eb0e2fe52e51c5)
            \
             N -- N -- N (a83161aa6c7d285cdddf9140051feeb51a56225d)

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 a83161aa6c7d285cdddf9140051feeb51a56225d
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Fri Oct 12 11:15:44 2018 -0400

    Add a flag to hide repositories entries in the Workbench menus. This is useful
    in a scenario where the jobs api is disabled and there are no local git
    repositories. Local git repositories are optional when using the containers api.
    
    refs #14338
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 124a78577..b017b4a29 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -87,7 +87,9 @@ SPDX-License-Identifier: AGPL-3.0 %>
                     <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
                   <% end %>
                 </li>
+                <% if Rails.configuration.repositories %>
                 <li role="menuitem"><a href="/repositories" role="menuitem"><i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories </a></li>
+                <% end -%>
                 <li role="menuitem"><a href="/current_token" role="menuitem"><i class="fa fa-lg fa-ticket fa-fw"></i> Current token</a></li>
                 <li role="menuitem">
                   <%= link_to ssh_keys_user_path(current_user), role: 'menu-item' do %>
@@ -121,9 +123,11 @@ SPDX-License-Identifier: AGPL-3.0 %>
                   <li role="presentation" class="dropdown-header">
                     Admin Settings
                   </li>
+                  <% if Rails.configuration.repositories %>
                   <li role="menuitem"><a href="/repositories">
                       <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
                   </a></li>
+                  <% end -%>
                   <li role="menuitem"><a href="/virtual_machines">
                       <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
                   </a></li>
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index e4ec41312..4e0a35a55 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -320,3 +320,9 @@ common:
   # Link to use for Arvados Workflow Composer app, or false if not available.
   #
   composer_url: false
+
+  #
+  # Should workbench allow management of local git repositories? Set to false if
+  # the jobs api is disabled and there are no local git repositories.
+  #
+  repositories: true

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


hooks/post-receive
--