Add latest changes from gitlab-org/gitlab@master

8 files changed, 60 insertions, 6 deletions

diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index fc694e0d37f..e11fa7d8801 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -254,11 +254,10 @@
   display: contents;
 
   gl-emoji {
-    margin-top: -1px;
-    margin-bottom: -1px;
+    margin-block: -0.1em;
 
     img {
-      top: 0;
+      top: -0.025em;
     }
   }
 }
diff --git a/app/assets/stylesheets/vendors/atwho.scss b/app/assets/stylesheets/vendors/atwho.scss
index e77e09bb85d..6a2f37beed0 100644
--- a/app/assets/stylesheets/vendors/atwho.scss
+++ b/app/assets/stylesheets/vendors/atwho.scss
@@ -79,6 +79,12 @@
 
       gl-emoji {
         @include gl-mr-2;
+        vertical-align: text-top;
+
+        img {
+          margin-block: -0.1em;
+          top: 0.05em;
+        }
       }
 
       .dropdown-label-box {
diff --git a/app/components/projects/ml/show_ml_model_component.rb b/app/components/projects/ml/show_ml_model_component.rb
index 03300f01f64..26155df3e81 100644
--- a/app/components/projects/ml/show_ml_model_component.rb
+++ b/app/components/projects/ml/show_ml_model_component.rb
@@ -18,7 +18,7 @@ module Projects
             id: model.id,
             name: model.name,
             path: model.path,
-            description: "This is a placeholder for the short description",
+            description: model.description,
             latest_version: latest_version_view_model,
             version_count: model.version_count
           }
diff --git a/app/models/packages/tag.rb b/app/models/packages/tag.rb
index 0df64bfba54..95cf312c174 100644
--- a/app/models/packages/tag.rb
+++ b/app/models/packages/tag.rb
@@ -19,6 +19,17 @@ class Packages::Tag < ApplicationRecord
       .limit(FOR_PACKAGES_TAGS_LIMIT)
   end
 
+  def self.for_package_ids_with_distinct_names(package_ids)
+    inner_query = select('DISTINCT ON (name) *').order(:name).for_package_ids(package_ids)
+
+    cte = Gitlab::SQL::CTE.new(:distinct_names_cte, inner_query)
+    cte_alias = cte.table.alias(table_name)
+
+    with(cte.to_arel)
+      .from(cte_alias)
+      .order(updated_at: :desc)
+  end
+
   def ensure_project_id
     self.project_id ||= package.project_id
   end
diff --git a/app/services/packages/npm/generate_metadata_service.rb b/app/services/packages/npm/generate_metadata_service.rb
index 8eaac547f7e..240c657039f 100644
--- a/app/services/packages/npm/generate_metadata_service.rb
+++ b/app/services/packages/npm/generate_metadata_service.rb
@@ -105,7 +105,7 @@ module Packages
       end
 
       def package_tags
-        Packages::Tag.for_package_ids(packages)
+        Packages::Tag.for_package_ids_with_distinct_names(packages)
                      .preload_package
       end
 
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 249a3a23aed..63cc855e4bd 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2577,6 +2577,15 @@
   :weight: 1
   :idempotent: false
   :tags: []
+- :name: bitbucket_server_import_stage_import_users
+  :worker_name: Gitlab::BitbucketServerImport::Stage::ImportUsersWorker
+  :feature_category: :importers
+  :has_external_dependencies: true
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: false
+  :tags: []
 - :name: bulk_import
   :worker_name: BulkImportWorker
   :feature_category: :importers
diff --git a/app/workers/gitlab/bitbucket_server_import/stage/import_repository_worker.rb b/app/workers/gitlab/bitbucket_server_import/stage/import_repository_worker.rb
index b378d07d59c..573c73cd7df 100644
--- a/app/workers/gitlab/bitbucket_server_import/stage/import_repository_worker.rb
+++ b/app/workers/gitlab/bitbucket_server_import/stage/import_repository_worker.rb
@@ -14,7 +14,11 @@ module Gitlab
 
           importer.execute
 
-          ImportPullRequestsWorker.perform_async(project.id)
+          if Feature.enabled?(:bitbucket_server_convert_mentions_to_users, project.creator)
+            ImportUsersWorker.perform_async(project.id)
+          else
+            ImportPullRequestsWorker.perform_async(project.id)
+          end
         end
 
         def importer_class
diff --git a/app/workers/gitlab/bitbucket_server_import/stage/import_users_worker.rb b/app/workers/gitlab/bitbucket_server_import/stage/import_users_worker.rb
new file mode 100644
index 00000000000..dd18139fc9e
--- /dev/null
+++ b/app/workers/gitlab/bitbucket_server_import/stage/import_users_worker.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BitbucketServerImport
+    module Stage
+      class ImportUsersWorker # rubocop:disable Scalability/IdempotentWorker -- ImportPullRequestsWorker is not idempotent
+        include StageMethods
+
+        private
+
+        def import(project)
+          importer = importer_class.new(project)
+
+          importer.execute
+
+          ImportPullRequestsWorker.perform_async(project.id)
+        end
+
+        def importer_class
+          Importers::UsersImporter
+        end
+      end
+    end
+  end
+end