Merge pull request #34 from NuGet/merge-dev

Merge branch 'master' into dev
NuGet · Mar 10, 2021 · 478cdb7 · 478cdb7
2 parents ff5f08d + 9cf447c
commit 478cdb7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/NuGet.Status/App_Code/ViewHelpers.cshtml b/src/NuGet.Status/App_Code/ViewHelpers.cshtml
@@ -56,10 +56,10 @@
     // There are no alerts on the status page.
 }
 
-@helper AnalyticsScript()
+@helper AnalyticsScript(dynamic ViewBag)
 {}
 
-@helper InstrumentationScript()
+@helper InstrumentationScript(dynamic ViewBag)
 {}
 
 @helper ReleaseMeta()
@@ -82,16 +82,21 @@
     // Gravatars are not displayed on the status page.
 }
 
-@helper UsabillaButton(UrlHelper url)
+@helper UsabillaButton(UrlHelper url, dynamic ViewBag)
 {
     // The Usabilla button is not displayed on the status page.
 }
 
-@helper UsabillaScript()
+@helper UsabillaScript(dynamic ViewBag)
 {
     // The Usabilla button is not displayed on the status page.
 }
 
+@helper CookieComplianceScript()
+{
+    // The cookie compliance script is not needed on the status page.
+}
+
 @helper PostLink(
     System.Web.Mvc.WebViewPage page,
     string formId,

diff --git a/src/NuGet.Status/NuGetGallery b/src/NuGet.Status/NuGetGallery