[arvados] updated: 2.6.0-601-gd4fb5ff830

git repository hosting git at public.arvados.org
Wed Sep 13 19:28:26 UTC 2023


Summary of changes:
 .../app/assets/stylesheets/application.css.scss    | 11 +++++++++
 apps/workbench/app/views/layouts/body.html.erb     | 26 ++++++++++++++++++----
 apps/workbench/test/integration/search_box_test.rb |  2 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

       via  d4fb5ff8307f22f49a78f8a1a804e3bf534c6173 (commit)
       via  52b9bbcab345d2d9ffbb18bc8d946c1d12180271 (commit)
       via  ee9d2efeaefb43fa77bdc567ddff0a46d3453a74 (commit)
       via  3c40555d09e8bee6db8e0c9d3169cf66b8a92c3d (commit)
       via  178013be0ccd804cb0579942ba50faa7cc68d52e (commit)
      from  a0f98a50de61aa4ef6a8beab91e1e08970196ee7 (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 d4fb5ff8307f22f49a78f8a1a804e3bf534c6173
Merge: a0f98a50de 52b9bbcab3
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Sep 13 15:28:12 2023 -0400

    Merge branch '20850-wb1-deprecated' refs #20850
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 52b9bbcab345d2d9ffbb18bc8d946c1d12180271
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Sep 13 15:26:28 2023 -0400

    20850: Fix capitalization and indentation
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 91e3406f7c..8b114478ba 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -86,8 +86,8 @@ SPDX-License-Identifier: AGPL-3.0 %>
                 <li role="menuitem">
                   <%
                   wb2_url = Rails.configuration.Services.Workbench2.ExternalURL.to_s
-                    if wb2_url[-1] == '/'
-                  wb2_url  = wb2_url.chop
+                  if wb2_url[-1] == '/'
+                    wb2_url  = wb2_url.chop
                   end
                   wb2_url += request.fullpath
                   %>
@@ -249,13 +249,13 @@ SPDX-License-Identifier: AGPL-3.0 %>
     <div id="deprecation-notice" class="row">
       <div class="col-md-12">
 	<div class="alert alert-block alert-warning">
-	  <span>You are using the <a href="https://doc.arvados.org/user/topics/workbench-migration.html">deprecated workbench application</a>
-	    to access Arvados. A newer workbench application is available.
-          <form action="<%= wb2_url %>" method="GET">
-                    <button type="submit">
-                      <i class="fa fa-lg fa-share-square fa-fw"></i> Go to Workbench 2
-                    </button>
-          </form>
+	  <span>You are using the <a href="https://doc.arvados.org/user/topics/workbench-migration.html">deprecated Workbench application</a>
+	    to access Arvados. A newer Workbench application is available.
+            <form action="<%= wb2_url %>" method="GET">
+              <button type="submit">
+                <i class="fa fa-lg fa-share-square fa-fw"></i> Go to Workbench 2
+              </button>
+            </form>
 	  </span>
     </div>
   </div>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list