Add latest changes from gitlab-org/gitlab@master

7 files changed, 25 insertions, 3 deletions

diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js
index 6c30294cbbb..b30eba25aa8 100644
--- a/app/assets/javascripts/lib/utils/text_utility.js
+++ b/app/assets/javascripts/lib/utils/text_utility.js
@@ -173,7 +173,7 @@ export const truncateSha = (sha) => sha.substring(0, 8);
  * @return {String}
  */
 export function capitalizeFirstCharacter(text) {
-  return `${text[0].toUpperCase()}${text.slice(1)}`;
+  return text?.length ? `${text[0].toUpperCase()}${text.slice(1)}` : '';
 }
 
 /**
diff --git a/app/assets/javascripts/search/sidebar/components/searchable_dropdown.vue b/app/assets/javascripts/search/sidebar/components/searchable_dropdown.vue
index c1f0bfc59f3..32327a39de0 100644
--- a/app/assets/javascripts/search/sidebar/components/searchable_dropdown.vue
+++ b/app/assets/javascripts/search/sidebar/components/searchable_dropdown.vue
@@ -185,6 +185,7 @@ export default {
     :searching="loading"
     :reset-button-label="$options.i18n.reset"
     :toggle-aria-labelled-by="labelId"
+    fluid-width
     searchable
     block
     @shown="openDropdown"
diff --git a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
index ef43b9c026d..c1ec3fe276f 100644
--- a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
@@ -12,6 +12,7 @@ fragment WorkItem on WorkItem {
   createdAt
   updatedAt
   closedAt
+  webUrl
   reference(full: true)
   createNoteEmail
   namespace {
diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss
index 84f0612a7b4..d8bccc49e29 100644
--- a/app/assets/stylesheets/framework/super_sidebar.scss
+++ b/app/assets/stylesheets/framework/super_sidebar.scss
@@ -461,3 +461,17 @@ $scroll-scrim-height: 2.25rem;
     opacity: 1;
   }
 }
+
+// Tweaks to the styles for the ScrollScrim component above (line 418)
+// are leaking into the collapsible list box dropdowns
+// https://gitlab.com/gitlab-org/gitlab/-/issues/435538
+
+.gl-new-dropdown {
+  .top-scrim-wrapper {
+    margin-bottom: 0;
+  }
+
+  .bottom-scrim-wrapper {
+    margin-top: 0;
+  }
+}
diff --git a/app/controllers/projects/gcp/artifact_registry/docker_images_controller.rb b/app/controllers/projects/gcp/artifact_registry/docker_images_controller.rb
index b88b86975a4..cd492e93d14 100644
--- a/app/controllers/projects/gcp/artifact_registry/docker_images_controller.rb
+++ b/app/controllers/projects/gcp/artifact_registry/docker_images_controller.rb
@@ -124,6 +124,10 @@ module Projects
 
             Time.zone.parse(upload_time)
           end
+
+          def details_url
+            "https://#{uri}"
+          end
         end
       end
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index c36898aaf70..7e6eb3529d9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -591,6 +591,8 @@ class User < MainClusterwide::ApplicationRecord
   scope :order_oldest_sign_in, -> { reorder(arel_table[:current_sign_in_at].asc.nulls_last) }
   scope :order_recent_last_activity, -> { reorder(arel_table[:last_activity_on].desc.nulls_last, arel_table[:id].asc) }
   scope :order_oldest_last_activity, -> { reorder(arel_table[:last_activity_on].asc.nulls_first, arel_table[:id].desc) }
+  scope :ordered_by_id_desc, -> { reorder(arel_table[:id].desc) }
+
   scope :dormant, -> { with_state(:active).human_or_service_user.where('last_activity_on <= ?', Gitlab::CurrentSettings.deactivate_dormant_users_period.day.ago.to_date) }
   scope :with_no_activity, -> { with_state(:active).human_or_service_user.where(last_activity_on: nil).where('created_at <= ?', MINIMUM_DAYS_CREATED.day.ago.to_date) }
   scope :by_provider_and_extern_uid, ->(provider, extern_uid) { joins(:identities).merge(Identity.with_extern_uid(provider, extern_uid)) }
diff --git a/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml b/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml
index 0118fe94810..750dea9896f 100644
--- a/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml
+++ b/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml
@@ -11,8 +11,8 @@
               Full name: #{docker_image.name}
             .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1
               = sprite_icon('earth', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16')
-              URI:
-              %a{ href: docker_image.uri, target: 'blank', rel: 'noopener noreferrer' }= docker_image.uri
+              %a{ href: docker_image.details_url, target: 'blank', rel: 'noopener noreferrer' }
+                Artifact Registry details page
             .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1
               = sprite_icon('doc-code', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16')
               Media Type: #{docker_image.media_type}