Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/build-images.gitlab-ci.yml

@@ -23,6 +23,11 @@ build-qa-image:
   script:
     - run_timed_command "scripts/build_qa_image"
 
+build-qa-image as-if-foss:
+  extends:
+    - build-qa-image
+    - .as-if-foss
+
 build-assets-image:
   extends:
     - .base-image-build

.gitlab/ci/global.gitlab-ci.yml

@@ -350,7 +350,7 @@
   variables:
     QEMU_IMAGE: tonistiigi/binfmt:qemu-v7.0.0
   before_script:
-    - source scripts/utils.sh
+    - !reference [.default-utils-before_script, before_script]
     - echo "$CI_REGISTRY_PASSWORD" | docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" --password-stdin
     - |
       if [[ "${ARCH}" =~ arm64 ]]; then

.solargraph.yml.example

@@ -24,4 +24,4 @@ formatter:
   rubocop: # formatting
 require_paths: []
 plugins: []
-max_files: 15000
+max_files: 20000

GITALY_SERVER_VERSION

@@ -1 +1 @@
-ced25e5189dc1ad4c22103b831672749f66e6775
+7009d90dabb1f18a921af11fe12cb8640d7fa14a

app/assets/javascripts/pages/projects/blob/show/index.js

@@ -27,8 +27,7 @@ const router = new VueRouter({ mode: 'history' });
 const viewBlobEl = document.querySelector('#js-view-blob-app');
 
 if (viewBlobEl) {
-  const { blobPath, projectPath, targetBranch, originalBranch } = viewBlobEl.dataset;
-
+  const { blobPath, projectPath, targetBranch, originalBranch, refType } = viewBlobEl.dataset;
   // eslint-disable-next-line no-new
   new Vue({
     el: viewBlobEl,
@@ -38,6 +37,7 @@ if (viewBlobEl) {
     provide: {
       targetBranch,
       originalBranch,
+      refType,
     },
     render(createElement) {
       return createElement(BlobContentViewer, {

app/assets/javascripts/repository/components/blob_content_viewer.vue

@@ -40,6 +40,9 @@ export default {
     originalBranch: {
       default: '',
     },
+    refType: {
+      default: '',
+    },
   },
   apollo: {
     projectInfo: {
@@ -76,6 +79,7 @@ export default {
           projectPath: this.projectPath,
           filePath: this.path,
           ref: this.originalBranch || this.ref,
+          refType: this.refType,
           shouldFetchRawText: Boolean(this.glFeatures.highlightJs),
         };
       },

app/assets/javascripts/work_items/components/work_item_detail.vue

@@ -19,6 +19,7 @@ import { getParameterByName } from '~/lib/utils/url_utility';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue';
 import {
+  sprintfWorkItem,
   i18n,
   WIDGET_TYPE_ASSIGNEES,
   WIDGET_TYPE_LABELS,
@@ -207,6 +208,9 @@ export default {
     canDelete() {
       return this.workItem?.userPermissions?.deleteWorkItem;
     },
+    confidentialTooltip() {
+      return sprintfWorkItem(this.$options.i18n.confidentialTooltip, this.workItemType);
+    },
     fullPath() {
       return this.workItem?.project.fullPath;
     },
@@ -482,7 +486,7 @@ export default {
         <gl-badge
           v-if="workItem.confidential"
           v-gl-tooltip.bottom
-          :title="$options.i18n.confidentialTooltip"
+          :title="confidentialTooltip"
           variant="warning"
           icon="eye-slash"
           class="gl-mr-3 gl-cursor-help"

app/assets/javascripts/work_items/constants.js

@@ -41,7 +41,7 @@ export const i18n = {
   ),
   updateError: s__('WorkItem|Something went wrong while updating the work item. Please try again.'),
   confidentialTooltip: s__(
-    'WorkItem|Only project members with at least the Reporter role, the author, and assignees can view or be notified about this task.',
+    'WorkItem|Only project members with at least the Reporter role, the author, and assignees can view or be notified about this %{workItemType}.',
   ),
 };
 

app/assets/stylesheets/utilities.scss

@@ -236,6 +236,25 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
   }
 }
 
+// Utils below are very specific so cannot be part of GitLab UI
+.gl-md-mt-5 {
+  @include gl-media-breakpoint-up(md) {
+    margin-top: $gl-spacing-scale-5;
+  }
+}
+
+.gl-sm-mr-0\! {
+  @include gl-media-breakpoint-down(md) {
+    margin-right: 0 !important;
+  }
+}
+
+.gl-sm-mb-5 {
+  @include gl-media-breakpoint-down(md) {
+    margin-bottom: $gl-spacing-scale-5;
+  }
+}
+
 
 .gl-gap-2 {
   gap: $gl-spacing-scale-2;

app/controllers/projects/blob_controller.rb

@@ -62,6 +62,7 @@ def create
   def show
     conditionally_expand_blob(@blob)
 
+    @ref_type = ref_type
     respond_to do |format|
       format.html do
         show_html
@@ -146,8 +147,8 @@ def blob
   end
 
   def commit
-    @commit ||= @repository.commit(@ref)
-
+    @repo = @repository
+    super
     return render_404 unless @commit
   end
 

app/controllers/projects/refs_controller.rb

@@ -22,7 +22,11 @@ def switch
           when "tree"
             project_tree_path(@project, @id)
           when "blob"
-            project_blob_path(@project, @id)
+            if Feature.enabled?(:use_ref_type_parameter, @project)
+              project_blob_path(@project, @id, ref_type: ref_type)
+            else
+              project_blob_path(@project, @id)
+            end
           when "graph"
             if Feature.enabled?(:use_ref_type_parameter, @project)
               project_network_path(@project, @id, ref_type: ref_type)

app/graphql/queries/repository/blob_info.query.graphql

@@ -2,6 +2,7 @@ query getBlobInfo(
   $projectPath: ID!
   $filePath: String!
   $ref: String!
+  $refType: String
   $shouldFetchRawText: Boolean!
 ) {
   project(fullPath: $projectPath) {
@@ -10,7 +11,7 @@ query getBlobInfo(
     repository {
       __typename
       empty
-      blobs(paths: [$filePath], ref: $ref) {
+      blobs(paths: [$filePath], ref: $ref, refType: $refType) {
         __typename
         nodes {
           __typename

app/graphql/resolvers/blobs_resolver.rb

@@ -17,26 +17,43 @@ class BlobsResolver < BaseResolver
              required: false,
              default_value: nil,
              description: 'Commit ref to get the blobs from. Default value is HEAD.'
+    argument :ref_type, GraphQL::Types::String,
+             required: false,
+             default_value: nil,
+             description: 'Type of the ref. heads for branches and tags for tags.'
 
     # We fetch blobs from Gitaly efficiently but it still scales O(N) with the
     # number of paths being fetched, so apply a scaling limit to that.
     def self.resolver_complexity(args, child_complexity:)
       super + (args[:paths] || []).size
     end
 
-    def resolve(paths:, ref:)
+    def resolve(paths:, ref:, ref_type:)
       authorize!(repository.container)
 
       return [] if repository.empty?
 
       ref ||= repository.root_ref
       validate_ref(ref)
 
-      repository.blobs_at(paths.map { |path| [ref, path] })
+      ref = fully_qualifed_ref(ref, ref_type)
+
+      repository.blobs_at(paths.map { |path| [ref, path] }).tap do |blobs|
+        blobs.each do |blob|
+          blob.ref_type = ref_type
+        end
+      end
     end
 
     private
 
+    def fully_qualifed_ref(ref, ref_type)
+      return ref unless ref_type.present? && Feature.enabled?(:use_ref_type_parameter, repository.project)
+
+      ref_type = ref_type == 'tags' ? 'tags' : 'heads'
+      %(refs/#{ref_type}/#{ref})
+    end
+
     def validate_ref(ref)
       unless Gitlab::GitRefValidator.validate(ref)
         raise Gitlab::Graphql::Errors::ArgumentError, 'Ref is not valid'

app/models/blob.rb

@@ -72,6 +72,7 @@ class Blob < SimpleDelegator
   ].freeze
 
   attr_reader :container
+  attr_accessor :ref_type
 
   delegate :repository, to: :container, allow_nil: true
   delegate :project, to: :repository, allow_nil: true

app/models/issue.rb

@@ -663,11 +663,6 @@ def hidden?
     author&.banned?
   end
 
-  # Necessary until all issues are backfilled and we add a NOT NULL constraint on the DB
-  def work_item_type
-    super || WorkItems::Type.default_by_type(issue_type)
-  end
-
   def expire_etag_cache
     key = Gitlab::Routing.url_helpers.realtime_changes_project_issue_path(project, self)
     Gitlab::EtagCaching::Store.new.touch(key)

app/models/packages/nuget.rb

@@ -3,6 +3,7 @@ module Packages
   module Nuget
     TEMPORARY_PACKAGE_NAME = 'NuGet.Temporary.Package'
     TEMPORARY_SYMBOL_PACKAGE_NAME = 'NuGet.Temporary.SymbolPackage'
+    FORMAT = 'nupkg'
 
     def self.table_name_prefix
       'packages_nuget_'

app/models/packages/package.rb

@@ -36,6 +36,7 @@ class Packages::Package < ApplicationRecord
   # TODO: put the installable default scope on the :package_files association once the dependent: :destroy is removed
   # See https://gitlab.com/gitlab-org/gitlab/-/issues/349191
   has_many :installable_package_files, -> { installable }, class_name: 'Packages::PackageFile', inverse_of: :package
+  has_many :installable_nuget_package_files, -> { installable.with_nuget_format }, class_name: 'Packages::PackageFile', inverse_of: :package
   has_many :dependency_links, inverse_of: :package, class_name: 'Packages::DependencyLink'
   has_many :tags, inverse_of: :package, class_name: 'Packages::Tag'
   has_one :conan_metadatum, inverse_of: :package, class_name: 'Packages::Conan::Metadatum'
@@ -128,6 +129,7 @@ class Packages::Package < ApplicationRecord
   scope :including_project_namespace_route, -> { includes(project: { namespace: :route }) }
   scope :including_tags, -> { includes(:tags) }
   scope :including_dependency_links, -> { includes(dependency_links: :dependency) }
+  scope :including_dependency_links_with_nuget_metadatum, -> { includes(dependency_links: [:dependency, :nuget_metadatum]) }
 
   scope :with_conan_channel, ->(package_channel) do
     joins(:conan_metadatum).where(packages_conan_metadata: { package_channel: package_channel })
@@ -149,12 +151,14 @@ class Packages::Package < ApplicationRecord
   end
   scope :preload_composer, -> { preload(:composer_metadatum) }
   scope :preload_npm_metadatum, -> { preload(:npm_metadatum) }
+  scope :preload_nuget_metadatum, -> { preload(:nuget_metadatum) }
   scope :preload_pypi_metadatum, -> { preload(:pypi_metadatum) }
 
   scope :without_nuget_temporary_name, -> { where.not(name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
 
   scope :has_version, -> { where.not(version: nil) }
   scope :preload_files, -> { preload(:installable_package_files) }
+  scope :preload_nuget_files, -> { preload(:installable_nuget_package_files) }
   scope :preload_pipelines, -> { preload(pipelines: :user) }
   scope :last_of_each_version, -> { where(id: all.select('MAX(id) AS id').group(:version)) }
   scope :limit_recent, ->(limit) { order_created_desc.limit(limit) }

app/models/packages/package_file.rb

@@ -44,6 +44,7 @@ class Packages::PackageFile < ApplicationRecord
   scope :with_file_name_like, ->(file_name) { where(arel_table[:file_name].matches(file_name)) }
   scope :with_files_stored_locally, -> { where(file_store: ::Packages::PackageFileUploader::Store::LOCAL) }
   scope :with_format, ->(format) { where(::Packages::PackageFile.arel_table[:file_name].matches("%.#{format}")) }
+  scope :with_nuget_format, -> { with_format(Packages::Nuget::FORMAT) }
 
   scope :preload_package, -> { preload(:package) }
   scope :preload_pipelines, -> { preload(pipelines: :user) }

app/presenters/blob_presenter.rb

@@ -56,23 +56,23 @@ def raw_plain_data
   end
 
   def web_url
-    url_helpers.project_blob_url(project, ref_qualified_path)
+    url_helpers.project_blob_url(*path_params)
   end
 
   def web_path
-    url_helpers.project_blob_path(project, ref_qualified_path)
+    url_helpers.project_blob_path(*path_params)
   end
 
   def edit_blob_path
-    url_helpers.project_edit_blob_path(project, ref_qualified_path)
+    url_helpers.project_edit_blob_path(*path_params)
   end
 
   def raw_path
-    url_helpers.project_raw_path(project, ref_qualified_path)
+    url_helpers.project_raw_path(*path_params)
   end
 
   def replace_path
-    url_helpers.project_update_blob_path(project, ref_qualified_path)
+    url_helpers.project_update_blob_path(*path_params)
   end
 
   def pipeline_editor_path
@@ -164,6 +164,18 @@ def project_blob_path_root
 
   private
 
+  def path_params
+    if Feature.enabled?(:use_ref_type_parameter, project) && ref_type
+      [project, ref_qualified_path, { ref_type: ref_type }]
+    else
+      [project, ref_qualified_path]
+    end
+  end
+
+  def ref_type
+    blob.try(:ref_type)
+  end
+
   def url_helpers
     Gitlab::Routing.url_helpers
   end
@@ -179,7 +191,12 @@ def project
   end
 
   def ref_qualified_path
-    File.join(blob.commit_id, blob.path)
+    commit_id = blob.commit_id
+
+    # A hack to make the commit_id response from gitaly something controllers can handle
+    commit_id = commit_id.sub(%r{^refs/(heads|tags)/}, '') if ref_type && Feature.enabled?(:use_ref_type_parameter, project)
+
+    File.join(commit_id, blob.path)
   end
 
   def load_all_blob_data

app/presenters/packages/nuget/packages_metadata_presenter.rb

@@ -10,6 +10,10 @@ class PackagesMetadataPresenter
 
       def initialize(packages)
         @packages = packages
+                    .preload_nuget_files
+                    .preload_nuget_metadatum
+                    .including_tags
+                    .including_dependency_links_with_nuget_metadatum
       end
 
       def count
@@ -23,12 +27,14 @@ def items
       private
 
       def summary
+        packages_with_metadata = @packages.map { |pkg| metadata_for(pkg) }
+
         {
           json_url: json_url,
           lower_version: lower_version,
           upper_version: upper_version,
-          packages_count: @packages.count,
-          packages: @packages.map { |pkg| metadata_for(pkg) }
+          packages_count: packages_with_metadata.size,
+          packages: packages_with_metadata
         }
       end