projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 5dc5d15)
18995: Merge branch 'main' into 18995-code-cleanup-1
authorWard Vandewege <ward@curii.com>
Fri, 15 Apr 2022 15:01:48 +0000 (11:01 -0400)
committerWard Vandewege <ward@curii.com>
Fri, 15 Apr 2022 15:01:48 +0000 (11:01 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

apps/workbench/Gemfile.lock patch | blob | history
doc/_layouts/default.html.liquid patch | blob | history
services/api/Gemfile.lock patch | blob | history

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index ab4f3a173a8efd555709648c378fe6337acacb2b..b272ffab8351dde236a221fe8c74afbc3fbc16b8 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -179,7 +179,7 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     npm-rails (0.2.1)
diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index db6c00bc3ec5c03ee89ddd27dd63b85ae81fd591..f07f33054493306690343ff6a3417a4f749bbbcb 100644 (file)
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -27,10 +27,15 @@ SPDX-License-Identifier: CC-BY-SA-3.0
     <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
     <script src="https://hypothes.is/embed.js" async></script>
 
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-        <script src="../assets/js/html5shiv.js"></script>
-        <![endif]-->
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-EFLSBXJ5SQ"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'G-EFLSBXJ5SQ');
+    </script>
   </head>
   <body class="nopad">
     {% include 'navbar_top' %}
@@ -54,16 +59,6 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
     </div>
     {% endif %}
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-40055979-1', 'arvados.org');
-  ga('send', 'pageview');
-
-    </script>
 
 {% if page.no_nav_left %}
 {% else %}
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c5ecbaef7a976f1423d0c2518e4f65885e1bee37..a33fae3e193d8b9f70e0df523c2781465776aea0 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -140,7 +140,7 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oj (3.9.2)