Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/frontend.gitlab-ci.yml

@@ -11,7 +11,7 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-rust-${RUST_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-lfs-${LFS_VERSION}-yarn-${YARN_VERSION}-graphicsmagick-${GRAPHICSMAGICK_VERSION}
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/ci/${BUILD_OS}-${OS_VERSION}-slim-ruby-${RUBY_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-lfs-${LFS_VERSION}-yarn-${YARN_VERSION}-graphicsmagick-${GRAPHICSMAGICK_VERSION}
   variables:
     SETUP_DB: "false"
     WEBPACK_VENDOR_DLL: "true"
@@ -30,7 +30,7 @@
     - yarn patch-package --reverse  # To avoid caching patched modules
 
 compile-production-assets:
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-rust-${RUST_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-lfs-${LFS_VERSION}-yarn-${YARN_VERSION}-graphicsmagick-${GRAPHICSMAGICK_VERSION}-docker-${DOCKER_VERSION}
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/ci/${BUILD_OS}-${OS_VERSION}-slim-ruby-${RUBY_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-lfs-${LFS_VERSION}-yarn-${YARN_VERSION}-graphicsmagick-${GRAPHICSMAGICK_VERSION}-docker-${DOCKER_VERSION}
   extends:
     - .use-buildx
     - .compile-assets-base

.gitlab/ci/version.yml

@@ -4,7 +4,7 @@ variables:
   DOCKER_VERSION: "27.4.1"
   EXIFTOOL_VERSION: "12.60"
   GCLOUD_VERSION: "413"
-  GIT_VERSION: "2.45"
+  GIT_VERSION: "2.49"
   GO_VERSION: "1.23"
   GRAPHICSMAGICK_VERSION: "1.3.36"
   HELM_VERSION: "3.16"

app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue

@@ -16,7 +16,6 @@ import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import DetailsRow from '~/vue_shared/components/registry/details_row.vue';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   REMOVE_TAG_BUTTON_TITLE,
   DIGEST_LABEL,
@@ -55,7 +54,6 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     tag: {
       type: Object,
@@ -164,9 +162,8 @@ export default {
     },
     isProtected() {
       return (
-        (this.tag.protection?.minimumAccessLevelForDelete != null ||
-          this.tag.protection?.minimumAccessLevelForPush != null) &&
-        this.glFeatures.containerRegistryProtectedTags
+        this.tag.protection?.minimumAccessLevelForDelete != null ||
+        this.tag.protection?.minimumAccessLevelForPush != null
       );
     },
     tagRowId() {

app/assets/javascripts/packages_and_registries/settings/project/components/container_registry_section.vue

@@ -1,6 +1,5 @@
 <script>
 import { GlLink, GlSprintf } from '@gitlab/ui';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
 import ContainerExpirationPolicy from '~/packages_and_registries/settings/project/components/container_expiration_policy.vue';
@@ -16,7 +15,6 @@ export default {
     ContainerProtectionTagRules,
     SettingsBlock,
   },
-  mixins: [glFeatureFlagsMixin()],
   inject: ['isContainerRegistryMetadataDatabaseEnabled'],
   props: {
     expanded: {
@@ -27,10 +25,7 @@ export default {
   },
   computed: {
     showContainerProtectedTagsSettings() {
-      return (
-        this.glFeatures.containerRegistryProtectedTags &&
-        this.isContainerRegistryMetadataDatabaseEnabled
-      );
+      return this.isContainerRegistryMetadataDatabaseEnabled;
     },
   },
   containerRegistryHelpPath: helpPagePath('user/packages/container_registry/_index.md'),

app/components/rapid_diffs/app_component.html.haml

@@ -1,4 +1,4 @@
-- if @preload
+- if !@lazy
   - helpers.add_page_startup_api_call @metadata_endpoint
   - helpers.add_page_startup_api_call @diff_files_endpoint
   - if @stream_url
@@ -23,14 +23,18 @@
         = helpers.gl_loading_icon(size: 'sm')
     .rd-app-content
       .rd-app-content-header{ data: { hidden_files_warning: true } }
+
+      - if empty_diff? && !@lazy
+        = render RapidDiffs::EmptyStateComponent.new
+
       .code{ class: helpers.user_color_scheme }
         %div{ data: { diffs_list: true } }
           = javascript_tag nonce: content_security_policy_nonce do
             :plain
               requestAnimationFrame(() => { window.performance.mark('rapid-diffs-first-diff-file-shown') })
           - if diffs_list?
             = diffs_list
-          - else
+          - elsif !empty_diff?
             = render RapidDiffs::DiffFileComponent.with_collection(@diffs_slice, parallel_view: @diff_view == :parallel)
           - if @stream_url
             #js-stream-container{ data: { diffs_stream_url: @stream_url } }

app/components/rapid_diffs/app_component.rb

@@ -13,7 +13,7 @@ def initialize(
       update_user_endpoint:,
       metadata_endpoint:,
       diff_files_endpoint:,
-      preload: true
+      lazy: false
     )
       @diffs_slice = diffs_slice
       @reload_stream_url = reload_stream_url
@@ -23,7 +23,11 @@ def initialize(
       @update_user_endpoint = update_user_endpoint
       @metadata_endpoint = metadata_endpoint
       @diff_files_endpoint = diff_files_endpoint
-      @preload = preload
+      @lazy = lazy
+    end
+
+    def empty_diff?
+      @diffs_slice.nil? || @diffs_slice.empty?
     end
 
     def browser_visible?

app/components/rapid_diffs/empty_state_component.html.haml

@@ -0,0 +1,9 @@
+.rd-app-empty-state.gl-mt-5.gl-text-center
+  = render Pajamas::CardComponent.new(card_options: { class: "gl-bg-subtle" }) do |c|
+    - c.with_body do
+      = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-commit-md.svg',
+        title: message) do |c|
+
+        - c.with_description do
+          -# TODO: Add secondary text
+          -# TODO: Add call to action button

app/components/rapid_diffs/empty_state_component.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RapidDiffs
+  class EmptyStateComponent < ViewComponent::Base
+    def initialize(message: nil)
+      @message = message || _('There are no changes')
+    end
+
+    private
+
+    attr_reader :message
+  end
+end

app/controllers/concerns/stream_diffs.rb

@@ -57,11 +57,19 @@ def view
   def stream_diff_files(options)
     return unless resource
 
+    diffs = resource.diffs_for_streaming(options)
+
+    if params.permit(:offset)[:offset].blank? && diffs.diff_files.empty?
+      empty_state_component = ::RapidDiffs::EmptyStateComponent.new
+      response.stream.write empty_state_component.render_in(view_context)
+      return
+    end
+
     # NOTE: This is a temporary flag to test out the new diff_blobs
     if !!ActiveModel::Type::Boolean.new.cast(params.permit(:diff_blobs)[:diff_blobs])
       stream_diff_blobs(options)
     else
-      resource.diffs_for_streaming(options).diff_files.each do |diff_file|
+      diffs.diff_files.each do |diff_file|
         response.stream.write(render_diff_file(diff_file))
       end
     end

app/controllers/projects/registry/repositories_controller.rb

@@ -10,10 +10,6 @@ class RepositoriesController < ::Projects::Registry::ApplicationController
         push_frontend_feature_flag(:show_container_registry_tag_signatures, project)
       end
 
-      before_action only: [:index, :show] do
-        push_frontend_feature_flag(:container_registry_protected_tags, project)
-      end
-
       before_action :authorize_update_container_image!, only: [:destroy]
 
       def index