Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 9 deletions

diff --git a/app/presenters/packages/nuget/presenter_helpers.rb b/app/presenters/packages/nuget/presenter_helpers.rb
index 82ed80d8372..ea8558c54f4 100644
--- a/app/presenters/packages/nuget/presenter_helpers.rb
+++ b/app/presenters/packages/nuget/presenter_helpers.rb
@@ -5,7 +5,6 @@ module Packages
     module PresenterHelpers
       include ::API::Helpers::RelatedResourcesHelpers
 
-      BLANK_STRING = ''
       PACKAGE_DEPENDENCY_GROUP = 'PackageDependencyGroup'
       PACKAGE_DEPENDENCY = 'PackageDependency'
 
@@ -45,14 +44,13 @@ module Packages
       def catalog_entry_for(package)
         {
           json_url: json_url_for(package),
-          authors: BLANK_STRING,
           dependency_groups: dependency_groups_for(package),
           package_name: package.name,
           package_version: package.version,
           archive_url: archive_url_for(package),
-          summary: BLANK_STRING,
           tags: tags_for(package),
-          metadatum: metadatum_for(package)
+          metadatum: metadatum_for(package),
+          published: package.created_at.iso8601
         }
       end
 
@@ -98,8 +96,8 @@ module Packages
         metadatum = package.nuget_metadatum
         return {} unless metadatum
 
-        metadatum.slice(:project_url, :license_url, :icon_url)
-                  .compact
+        metadatum.slice(:authors, :description, :project_url, :license_url, :icon_url)
+                 .compact
       end
 
       def base_path_for(package)
diff --git a/app/presenters/packages/nuget/search_results_presenter.rb b/app/presenters/packages/nuget/search_results_presenter.rb
index 311296d576c..45c2c5170ae 100644
--- a/app/presenters/packages/nuget/search_results_presenter.rb
+++ b/app/presenters/packages/nuget/search_results_presenter.rb
@@ -20,11 +20,9 @@ module Packages
 
           {
             type: 'Package',
-            authors: '',
             name: package_name,
             version: latest_version,
             versions: build_package_versions(packages),
-            summary: '',
             total_downloads: 0,
             verified: true,
             tags: tags_for(latest_package),
@@ -48,7 +46,7 @@ module Packages
 
       def latest_version(packages)
         versions = packages.map(&:version).compact
-        VersionSorter.sort(versions).last # rubocop: disable Style/RedundantSort
+        VersionSorter.sort(versions).last
       end
     end
   end