Merge pull request #8418 from NuGet/dev

[ReleasePrep][2020.02.15] RI of dev into master

Author: loic-sharma

src/AccountDeleter/Configuration/GalleryConfiguration.cs

@@ -108,7 +108,6 @@ public string SiteRoot
         public string EmbeddedIconUrlTemplate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool SelfServiceAccountDeleteEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string DeploymentLabel { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public string UsabillaFeedbackButtonId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public int? MinWorkerThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public int? MaxWorkerThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public int? MinIoThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -24,10 +24,6 @@
   width: device-width;
 }
 
-// See: https://stackoverflow.com/a/19706857
-body {
-  -ms-overflow-style: scrollbar;
-}
 
 // Visibility utilities
 // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0

src/Bootstrap/dist/css/bootstrap.css

@@ -417,17 +417,6 @@ img.reserved-indicator-icon {
   }
 }
 
-.usabilla-button {
-  top: auto !important;
-  margin-top: -65px;
-  bottom: 20%;
-  width: 40px;
-  height: 130px;
-  position: fixed;
-  z-index: 99999;
-  right: 0;
-}
-
 .sortable {
 	cursor: pointer;
 }

src/Bootstrap/less/responsive-utilities.less

@@ -65,7 +65,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/Bootstrap/less/theme/base.less

@@ -89,7 +89,7 @@
       <Version>4.3.0-dev-3612825</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Cursor">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

@@ -47,7 +47,7 @@
       <Version>5.8.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.FeatureFlags">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>9.3.3</Version>
@@ -56,13 +56,13 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Issues">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.elmah.corelibrary">
       <Version>1.2.2</Version>

src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

@@ -406,8 +406,6 @@ public string ExternalBrandingMessage
         [DefaultValue(null)]
         public string DeploymentLabel { get; set; }
 
-        public string UsabillaFeedbackButtonId { get; set; }
-
         [DefaultValue(null)]
         public int? MinWorkerThreads { get; set; }
         [DefaultValue(null)]

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -39,7 +39,6 @@ public class FeatureFlagService : IFeatureFlagService
         private const string ODataCacheDurationsFeatureName = GalleryPrefix + "ODataCacheDurations";
         private const string ShowEnable2FADialog = GalleryPrefix + "ShowEnable2FADialog";
         private const string Get2FADismissFeedback = GalleryPrefix + "Get2FADismissFeedback";
-        private const string UsabillaOnEveryPageFeatureName = GalleryPrefix + "UsabillaEveryPage";
         private const string PackageRenamesFeatureName = GalleryPrefix + "PackageRenames";
         private const string EmbeddedReadmeFlightName = GalleryPrefix + "EmbeddedReadmes";
         private const string LicenseMdRenderingFlightName = GalleryPrefix + "LicenseMdRendering";
@@ -215,11 +214,6 @@ public bool IsGet2FADismissFeedbackEnabled()
             return _client.IsEnabled(Get2FADismissFeedback, defaultValue: false);
         }
 
-        public bool IsUsabillaButtonEnabledOnEveryPage()
-        {
-            return _client.IsEnabled(UsabillaOnEveryPageFeatureName, defaultValue: false);
-        }
-
         public bool IsPackageRenamesEnabled(User user)
         {
             return _client.IsEnabled(PackageRenamesFeatureName, user, defaultValue: false);

src/NuGetGallery.Services/Configuration/AppConfiguration.cs

@@ -461,12 +461,6 @@ public interface IAppConfiguration : IMessageServiceConfiguration
         /// </summary>
         string DeploymentLabel { get; set; }
 
-        /// <summary>
-        /// The Usabilla feedback button ID embedded in the JavaScript snippet obtained from Usabilla. The ID can found
-        /// in your button's JavaScript code. Look for "//w.usabilla.com/{button ID}.js".
-        /// </summary>
-        string UsabillaFeedbackButtonId { get; set; }
-
         /// <summary>
         /// Allows to override the default (or externally configured) minWorkerThreads setting. Must be specified with <see cref="MinIoThreads"/>.
         /// This is a global (not per CPU core) limit.

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -153,11 +153,6 @@ public interface IFeatureFlagService
         /// </summary>
         bool IsGet2FADismissFeedbackEnabled();
 
-        /// <summary>
-        /// Whether we should enable the Usabilla feedback button on every page.
-        /// </summary>
-        bool IsUsabillaButtonEnabledOnEveryPage();
-
         /// <summary>
         /// Whether the user is able to see or manage the package renames information.
         /// </summary>

src/NuGetGallery.Services/Configuration/IAppConfiguration.cs

@@ -307,10 +307,10 @@
       <Version>5.8.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.WebBackgrounder">
       <Version>0.2.0</Version>

src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs

@@ -348,37 +348,6 @@
     }
 }
 
-@helper UsabillaButton(UrlHelper url, dynamic viewBag)
-{
-    if (GetUsabillaButtonIdOrNull(viewBag) != null)
-    {
-<div class="usabilla-button" id="usabilla-button" style="display: none">
-    <a tabindex="0" id="usbl-integrated-button" href="#" role="button">
-        <img width="40" height="130" src="~/Content/gallery/img/feedback.svg" alt="Usabilla Feedback"
-                @ViewHelpers.ImageFallback(url.Absolute("~/Content/gallery/img/feedback-40x130.png")) />
-    </a>
-</div>
-    }
-}
-
-@helper UsabillaScript(dynamic viewBag)
-{
-    var buttonId = GetUsabillaButtonIdOrNull(viewBag);
-    if (buttonId != null)
-    {
-        var obfuscatedPath = ObfuscationHelper.ObfuscateRequestUrl(new HttpContextWrapper(HttpContext.Current), RouteTable.Routes);
-<!-- begin usabilla live embed code -->
-<script type="text/javascript">
-/*{literal}<![CDATA[*/window.lightningjs||function(c){function g(b,d){d&&(d+=(/\?/.test(d)?"&":"?")+"lv=1");c[b]||function(){var i=window,h=document,j=b,g=h.location.protocol,l="load",k=0;(function(){function b(){a.P(l);a.w=1;c[j]("_load")}c[j]=function(){function m(){m.id=e;return c[j].apply(m,arguments)}var b,e=++k;b=this&&this!=i?this.id||0:0;(a.s=a.s||[]).push([e,b,arguments]);m.then=function(b,c,h){var d=a.fh[e]=a.fh[e]||[],j=a.eh[e]=a.eh[e]||[],f=a.ph[e]=a.ph[e]||[];b&&d.push(b);c&&j.push(c);h&&f.push(h);return m};return m};var a=c[j]._={};a.fh={};a.eh={};a.ph={};a.l=d?d.replace(/^\/\//,(g=="https:"?g:"http:")+"//"):d;a.p={0:+new Date};a.P=function(b){a.p[b]=new Date-a.p[0]};a.w&&b();i.addEventListener?i.addEventListener(l,b,!1):i.attachEvent("on"+l,b);var q=function(){function b(){return["<head></head><",c,' onload="var d=',n,";d.getElementsByTagName('head')[0].",d,"(d.",g,"('script')).",i,"='",a.l,"'\"></",c,">"].join("")}var c="body",e=h[c];if(!e)return setTimeout(q,100);a.P(1);var d="appendChild",g="createElement",i="src",k=h[g]("div"),l=k[d](h[g]("div")),f=h[g]("iframe"),n="document",p;k.style.display="none";e.insertBefore(k,e.firstChild).id=o+"-"+j;f.frameBorder="0";f.id=o+"-frame-"+j;/MSIE[ ]+6/.test(navigator.userAgent)&&(f[i]="javascript:false");f.allowTransparency="true";l[d](f);try{f.contentWindow[n].open()}catch(s){a.domain=h.domain,p="javascript:var d="+n+".open();d.domain='"+h.domain+"';",f[i]=p+"void(0);"}try{var r=f.contentWindow[n];r.write(b());r.close()}catch(t){f[i]=p+'d.write("'+b().replace(/"/g,String.fromCharCode(92)+'"')+'");d.close();'}a.P(2)};a.l&&setTimeout(q,0)})()}();c[b].lv="1";return c[b]}var o="lightningjs",k=window[o]=g(o);k.require=g;k.modules=c}({});
-window.usabilla_live = lightningjs.require("usabilla_live", "//w.usabilla.com/@(buttonId).js");
-/*]]>{/literal}*/</script>
-<!-- end usabilla live embed code -->
-<script type="text/javascript">
-window.nuget.enableUsabilla('@obfuscatedPath');
-</script>
-    }
-}
-
 @helper AccordionBar(
     string groupName,
     WebViewPage page,
@@ -728,29 +697,6 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);
 
 @functions
 {
-    public static string GetUsabillaButtonIdOrNull(dynamic viewBag)
-    {
-        var config = DependencyResolver.Current.GetService<IGalleryConfigurationService>();
-        if (config != null)
-        {
-            var buttonId = config.Current.UsabillaFeedbackButtonId;
-            if (!string.IsNullOrWhiteSpace(buttonId))
-            {
-                var featureFlagService = DependencyResolver.Current.GetService<IFeatureFlagService>();
-                if (featureFlagService.IsUsabillaButtonEnabledOnEveryPage())
-                {
-                    bool canWriteAnalyticsCookies = viewBag.CanWriteAnalyticsCookies ?? false;
-                    if (canWriteAnalyticsCookies)
-                    {
-                        return buttonId;
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
     public static bool IsLicenseOrException(CompositeLicenseExpressionSegment segment)
     {
         return segment.Type == CompositeLicenseExpressionSegmentType.LicenseIdentifier || segment.Type == CompositeLicenseExpressionSegmentType.ExceptionIdentifier;

src/NuGetGallery.Services/NuGetGallery.Services.csproj

@@ -8,7 +8,6 @@
     "NuGetGallery.ODataCacheDurations": "Enabled",
     "NuGetGallery.ShowEnable2FADialog": "Enabled",
     "NuGetGallery.Get2FADismissFeedback": "Disabled",
-    "NuGetGallery.UsabillaEveryPage": "Enabled",
     "NuGetGallery.ODataV1GetAllNonHijacked": "Enabled",
     "NuGetGallery.ODataV1GetAllCountNonHijacked": "Enabled",
     "NuGetGallery.ODataV1GetSpecificNonHijacked": "Enabled",

src/NuGetGallery/App_Code/ViewHelpers.cshtml

@@ -31,34 +31,39 @@ public virtual ActionResult Index()
         public virtual ActionResult Pending()
         {
             var validationSets = _validationAdminService.GetPending();
-            var validatedPackages = ToValidatedPackages(validationSets);
-            var validationSetIds = validatedPackages
+            var packageValidations = ToPackageValidations(validationSets);
+            var validationSetIds = packageValidations
                 .SelectMany(p => p.ValidationSets)
                 .Select(s => s.ValidationTrackingId);
             var query = string.Join("\r\n", validationSetIds);
 
-            return View(nameof(Index), new ValidationPageViewModel(query, validatedPackages));
+            return View(nameof(Index), new ValidationPageViewModel(query, packageValidations));
         }
 
         [HttpGet]
         public virtual ActionResult Search(string q)
         {
             var packageValidationSets = _validationAdminService.Search(q ?? string.Empty);
-            var validatedPackages = ToValidatedPackages(packageValidationSets);
+            var validatedPackages = ToPackageValidations(packageValidationSets);
 
             return View(nameof(Index), new ValidationPageViewModel(q, validatedPackages));
         }
 
-        private List<ValidatedPackageViewModel> ToValidatedPackages(IReadOnlyList<PackageValidationSet> packageValidationSets)
+        private List<NuGetPackageValidationViewModel> ToPackageValidations(IReadOnlyList<PackageValidationSet> packageValidationSets)
         {
-            var validatedPackages = new List<ValidatedPackageViewModel>();
-            AppendValidatedPackages(validatedPackages, packageValidationSets, ValidatingType.Package);
-            AppendValidatedPackages(validatedPackages, packageValidationSets, ValidatingType.SymbolPackage);
+            // TODO: Add generic validation sets.
+            // Tracked by: https://github.com/NuGet/Engineering/issues/3587
+            var packageValidations = new List<NuGetPackageValidationViewModel>();
+            AppendNuGetPackageValidations(packageValidations, packageValidationSets, ValidatingType.Package);
+            AppendNuGetPackageValidations(packageValidations, packageValidationSets, ValidatingType.SymbolPackage);
 
-            return validatedPackages;
+            return packageValidations;
         }
 
-        private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPackages, IEnumerable<PackageValidationSet> validationSets, ValidatingType validatingType)
+        private void AppendNuGetPackageValidations(
+            List<NuGetPackageValidationViewModel> packageValidations,
+            IEnumerable<PackageValidationSet> validationSets,
+            ValidatingType validatingType)
         {
             var groups = validationSets
                 .Where(x => x.ValidatingType == validatingType)
@@ -77,9 +82,9 @@ private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPa
                         .OrderBy(x => x.Started)
                         .ToList();
                 }
-                var deletedStatus = _validationAdminService.GetDeletedStatus(group.Key, validatingType);
-                var validatedPackage = new ValidatedPackageViewModel(group.ToList(), deletedStatus, validatingType);
-                validatedPackages.Add(validatedPackage);
+                var deletedStatus = _validationAdminService.GetDeletedStatus(group.Key.Value, validatingType);
+                var packageValidation = new NuGetPackageValidationViewModel(group.ToList(), deletedStatus, validatingType);
+                packageValidations.Add(packageValidation);
             }
         }
     }

src/NuGetGallery/App_Data/Files/Content/flags.json

@@ -67,14 +67,16 @@ public IReadOnlyList<PackageValidationSet> GetPending()
             var pendingPackages = _packages
                 .GetAll()
                 .Where(p => p.PackageStatusKey == PackageStatus.Validating)
-                .Select(p => p.Key)
+                .Select(p => (int?)p.Key)
                 .ToList();
             var pendingSymbolPackages = _symbolPackages
                 .GetAll()
                 .Where(s => s.StatusKey == PackageStatus.Validating)
-                .Select(s => s.Key)
+                .Select(s => (int?)s.Key)
                 .ToList();
 
+            // TODO: Add generic validation sets.
+            // Tracked by: https://github.com/NuGet/Engineering/issues/3587
             AddPendingValidationSets(pendingValidations, pendingPackages, ValidatingType.Package);
             AddPendingValidationSets(pendingValidations, pendingSymbolPackages, ValidatingType.SymbolPackage);
 
@@ -228,7 +230,7 @@ private void SearchByPackageId(Dictionary<long, PackageValidationSet> validation
 
         private void AddPendingValidationSets(
             List<PackageValidationSet> validationSets,
-            IReadOnlyList<int> packageKeys,
+            IReadOnlyList<int?> packageKeys,
             ValidatingType type)
         {
             foreach (var packageKeyBatch in Batch(packageKeys, PendingValidationsBatchSize))
@@ -237,7 +239,7 @@ private void AddPendingValidationSets(
                     _validationSets
                         .GetAll()
                         .Where(v => v.ValidatingType == type)
-                        .Where(v => packageKeys.Contains(v.PackageKey)));
+                        .Where(v => packageKeyBatch.Contains(v.PackageKey)));
             }
         }
 

src/NuGetGallery/Areas/Admin/Controllers/ValidationController.cs

@@ -1,19 +1,30 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NuGet.Services.Validation;
 using NuGetGallery.Areas.Admin.Models;
 
 namespace NuGetGallery.Areas.Admin.ViewModels
 {
-    public class ValidatedPackageViewModel : IPackageVersionModel
+    public class NuGetPackageValidationViewModel : IPackageVersionModel
     {
-        public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationSets, PackageDeletedStatus deletedStatus, ValidatingType validatingType)
+        public NuGetPackageValidationViewModel(
+            IReadOnlyList<PackageValidationSet> validationSets,
+            PackageDeletedStatus deletedStatus,
+            ValidatingType validatingType)
         {
+            if (validatingType == ValidatingType.Generic)
+            {
+                throw new ArgumentException(
+                    $"Unsupported validation type of {validatingType}",
+                    nameof(validatingType));
+            }
+
             var first = validationSets.First();
-            PackageKey = first.PackageKey;
+            PackageKey = first.PackageKey.Value;
             Id = first.PackageId;
             NormalizedVersion = first.PackageNormalizedVersion;
             DeletedStatus = deletedStatus;

src/NuGetGallery/Areas/Admin/Services/ValidationAdminService.cs

@@ -11,10 +11,10 @@ public ValidationPageViewModel() : this(null, null)
         {
         }
 
-        public ValidationPageViewModel(string query, IReadOnlyList<ValidatedPackageViewModel> packages)
+        public ValidationPageViewModel(string query, IReadOnlyList<NuGetPackageValidationViewModel> packages)
         {
             Query = query ?? string.Empty;
-            Packages = packages ?? new List<ValidatedPackageViewModel>();
+            Packages = packages ?? new List<NuGetPackageValidationViewModel>();
         }
 
         public string Query { get; }
@@ -23,6 +23,6 @@ public ValidationPageViewModel(string query, IReadOnlyList<ValidatedPackageViewM
 
         public bool HasResults => Packages.Count > 0;
 
-        public IReadOnlyList<ValidatedPackageViewModel> Packages { get; }
+        public IReadOnlyList<NuGetPackageValidationViewModel> Packages { get; }
     }
 }

src/NuGetGallery/Areas/Admin/ViewModels/ValidatedPackageViewModel.cs src/NuGetGallery/Areas/Admin/ViewModels/NuGetPackageValidationViewModel.cs

@@ -190,7 +190,7 @@
     <Compile Include="Areas\Admin\ViewModels\ModifyFeatureFlagsFlightViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\ApiKeyRevokeViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\SiteAdminsViewModel.cs" />
-    <Compile Include="Areas\Admin\ViewModels\ValidatedPackageViewModel.cs" />
+    <Compile Include="Areas\Admin\ViewModels\NuGetPackageValidationViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\RevalidationPageViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\ValidationPageViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\DeleteAccountSearchResult.cs" />
@@ -1305,8 +1305,6 @@
     <Content Include="Areas\Admin\DynamicData\PageTemplates\ListDetails.aspx" />
     <Content Include="Content\admin\SupportRequestStyles.css" />
     <Content Include="Content\fabric.css" />
-    <Content Include="Content\gallery\img\feedback-40x130.png" />
-    <Content Include="Content\gallery\img\feedback.svg" />
     <Content Include="Content\gallery\img\logo-og-600x600.png" />
     <Content Include="Content\gallery\img\rss-24x24.png" />
     <Content Include="Content\Images\icons\apiKey.png" />
@@ -2242,13 +2240,13 @@
       <Version>5.8.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Licenses">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Owin">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.82.0</Version>
+      <Version>2.84.0</Version>
     </PackageReference>
     <PackageReference Include="Owin">
       <Version>1.0.0</Version>

src/NuGetGallery/Areas/Admin/ViewModels/ValidationPageViewModel.cs

@@ -462,59 +462,6 @@
         }
     };
 
-    nuget.enableUsabilla = function (obfuscatedPath) {
-        // Only enable Usabilla if the API is available and the button container is in the DOM. If the user has
-        // external scripts blocked or trackers blocks, Usabilla might not be loaded at all. This method was confirmed
-        // with Usabilla support staff.
-        if (window.usabilla_live !== undefined && $(".usabilla_live_button_container").length > 0) {
-            // If there is an obfuscated path, hook into the outgoing AJAX request containing the feedback and obfuscate
-            // the URL data. This approach was provided by the Usabilla technical support.
-            if (obfuscatedPath) {
-                var obfuscatedUrl = document.createElement('a');
-                obfuscatedUrl.href = window.location.href;
-                if (obfuscatedPath.substring(0, 1) != "/") {
-                    obfuscatedUrl.pathname = "/" + obfuscatedPath;
-                } else {
-                    obfuscatedUrl.pathname = obfuscatedPath;
-                }
-
-                window.usabilla_live("setEventCallback", function (category, action, label, value, eventdata) {
-                    if (action != "Feedback:Open") {
-                        return;
-                    }
-
-                    function sendWithObfuscation(vData) {
-                        if (vData) {
-                            var data = JSON.parse(vData);
-                            data.url = obfuscatedUrl.href;
-                            vData = JSON.stringify(data);
-                            arguments[0] = vData;
-                        }
-                        realSend.apply(this, arguments);
-                    }
-
-                    var realSend = XMLHttpRequest.prototype.send;
-                    var ub_window = document.getElementById("lightningjs-frame-usabilla_live_feedback").contentWindow;
-                    ub_window.XMLHttpRequest.prototype.send = sendWithObfuscation;
-                    if (window.XDomainRequest) {
-                        realSend = XDomainRequest.prototype.send;
-                        ub_window.XDomainRequest.prototype.send = sendWithObfuscation;
-                    }
-                });
-            }
-
-            // Hide the default feedback button.
-            window.usabilla_live("hide");
-
-            // Wire-up and show the custom feedback button.
-            document.getElementById("usbl-integrated-button").addEventListener("click", function (event) {
-                event.preventDefault();
-                window.usabilla_live("click");
-            });
-            document.getElementById("usabilla-button").style.display = "block";
-        }
-    };
-
     window.nuget = nuget;
 
     jQuery.extend(jQuery.expr.pseudos, {

src/NuGetGallery/Content/gallery/img/feedback-40x130.png

@@ -42,11 +42,9 @@
     <div id="skippedToContent">
     @RenderBody()
     </div>
-    @ViewHelpers.UsabillaButton(Url, ViewBag)
     @Html.Partial("Gallery/Footer")
     @ViewHelpers.CookieComplianceScript()
     @Scripts.Render("~/Scripts/gallery/site.min.js")
     @RenderSection("BottomScripts", required: false)
-    @ViewHelpers.UsabillaScript(ViewBag)
 </body>
 </html>

src/NuGetGallery/Content/gallery/img/feedback.svg

@@ -81,8 +81,6 @@
     <add key="Gallery.AppInsightsHeartbeatIntervalSeconds" value="60"/>
     <!-- Set this if you have a Google Analytics property for the site -->
     <add key="Gallery.GoogleAnalyticsPropertyId" value=""/>
-    <!-- Set this if you have a Usabilla button ID so that a feedback button appears on every page -->
-    <add key="Gallery.UsabillaFeedbackButtonId" value=""/>
     <!-- Set this to the Azure CDN Host you are using for blob storage, if you have configured one -->
     <add key="Gallery.AzureCdnHost" value=""/>
     <add key="Gallery.SiteRoot" value="http://localhost"/>