Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/gitlab/documentation_links/link.yml

@@ -6,7 +6,6 @@ Gitlab/DocumentationLinks/Link:
     - '**/*.haml'
     - 'app/controllers/jira_connect/app_descriptor_controller.rb'
     - 'app/controllers/jwt_controller.rb'
-    - 'app/helpers/ci/jobs_helper.rb'
     - 'app/helpers/ide_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/releases_helper.rb'
@@ -23,7 +22,6 @@ Gitlab/DocumentationLinks/Link:
     - 'ee/app/helpers/projects/security/api_fuzzing_configuration_helper.rb'
     - 'ee/app/helpers/vulnerabilities_helper.rb'
     - 'ee/app/models/integrations/github.rb'
-    - 'ee/app/presenters/ee/merge_request_presenter.rb'
     - 'ee/lib/api/managed_licenses.rb'
     - 'ee/lib/ee/gitlab/namespace_storage_size_error_message.rb'
     - 'ee/lib/gitlab/checks/secrets_check.rb'

.rubocop_todo/gitlab/rails/safe_format.yml

@@ -22,12 +22,3 @@ Gitlab/Rails/SafeFormat:
     - 'ee/app/components/namespaces/free_user_cap/usage_quota_alert_component.rb'
     - 'ee/app/components/namespaces/free_user_cap/usage_quota_trial_alert_component.rb'
     - 'ee/app/helpers/ee/application_helper.rb'
-    - 'ee/app/helpers/ee/import_helper.rb'
-    - 'ee/app/helpers/ee/members_helper.rb'
-    - 'ee/app/helpers/ee/search_helper.rb'
-    - 'ee/app/helpers/push_rules_helper.rb'
-    - 'ee/app/models/integrations/git_guardian.rb'
-    - 'ee/app/models/integrations/github.rb'
-    - 'ee/lib/gitlab/licenses/submit_license_usage_data_banner.rb'
-    - 'ee/lib/gitlab/manual_quarterly_co_term_banner.rb'
-    - 'spec/helpers/profiles_helper_spec.rb'

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-present GitLab B.V.
+Copyright (c) 2011-present GitLab Inc.
 
 Portions of this software are licensed as follows:
 

app/assets/javascripts/behaviors/shortcuts/keybindings.js

@@ -549,15 +549,14 @@ const WEB_IDE_GO_TO_FILE = {
 
 /**
  * Legacy Web IDE uses @keydown.ctrl.enter and @keydown.meta.enter events here:
- * https://gitlab.com/gitlab-org/gitlab/-/blob/f3e807cdff5cf25765894163b4e92f8b2bcf8a68/app/assets/javascripts/ide/components/shared/commit_message_field.vue#L131-132
+ * https://gitlab.com/gitlab-org/gitlab/-/blob/f3e807cdff5cf25765894163b4e92f8b2bcf8a68/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue#L122-123
  */
 const WEB_IDE_COMMIT = {
   id: 'webIDE.commit',
   description: __('Commit (when editing commit message)'),
   defaultKeys: ['mod+enter'],
   customizable: false,
 };
-
 // All keybinding groups
 const GLOBAL_SHORTCUTS_GROUP = {
   id: 'globalShortcuts',

app/assets/javascripts/ide/components/shared/commit_message_field.vue

@@ -272,7 +272,7 @@ export default {
     <div class="gl-flex gl-flex-wrap gl-items-center">
       <div
         data-testid="md-header-toolbar"
-        class="md-header-toolbar gl-flex gl-grow gl-items-start gl-gap-y-2 gl-py-3"
+        class="md-header-toolbar gl-flex gl-grow gl-items-start gl-gap-y-2 gl-bg-default gl-py-3"
       >
         <div class="gl-flex gl-flex-wrap gl-gap-y-2">
           <gl-button

app/assets/javascripts/vue_shared/components/markdown/header.vue

@@ -11,30 +11,18 @@ def initialize(project, params = {})
       def execute
         return packages if project && params[:package_name]
 
-        if Feature.enabled?(:terraform_extract_terraform_package_model, Feature.current_request)
-          ::Packages::TerraformModule::Package.none
-        else
-          ::Packages::Package.none
-        end
+        ::Packages::TerraformModule::Package.none
       end
 
       private
 
       attr_reader :project, :params
 
       def packages
-        result = if Feature.enabled?(:terraform_extract_terraform_package_model, Feature.current_request)
-                   ::Packages::TerraformModule::Package
-                     .for_projects(project)
-                     .with_name(params[:package_name])
-                     .installable
-                 else
-                   project
-                     .packages
-                     .with_name(params[:package_name])
-                     .terraform_module
-                     .installable
-                 end
+        result = ::Packages::TerraformModule::Package
+                   .for_projects(project)
+                   .with_name(params[:package_name])
+                   .installable
 
         params[:package_version] ? result.with_version(params[:package_version]) : result.has_version.order_version_desc
       end

app/finders/packages/terraform_module/packages_finder.rb

@@ -12,7 +12,7 @@ def jobs_data(project, build)
         "artifact_help_url" => help_page_path('user/gitlab_com/index.md', anchor: 'gitlab-cicd'),
         "deployment_help_url" => help_page_path('user/project/clusters/deploy_to_cluster.md', anchor: 'troubleshooting'),
         "runner_settings_url" => project_runners_path(build.project, anchor: 'js-runners-settings'),
-        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings.md', anchor: 'retry-outdated-jobs'),
+        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings.md', anchor: 'prevent-outdated-deployment-jobs'),
         "pipeline_test_report_url" => test_report_project_pipeline_path(project, build.pipeline),
         "log_viewer_path" => viewer_project_job_path(project, build),
         "job_gid" => build.to_gid.to_s

app/helpers/ci/jobs_helper.rb

@@ -51,11 +51,7 @@ def sync_traversal_ids!
         %w[namespaces], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424279'
       ) do
         Namespace.transaction do
-          if sync_traversal_ids_nowait?
-            Gitlab::Database::Transaction::Settings.with('LOCK_TIMEOUT', LOCK_TIMEOUT) do
-              @root.lock!('FOR NO KEY UPDATE')
-            end
-          else
+          Gitlab::Database::Transaction::Settings.with('LOCK_TIMEOUT', LOCK_TIMEOUT) do
             @root.lock!('FOR NO KEY UPDATE')
           end
 
@@ -121,9 +117,5 @@ def db_query_timeout_counter
     def db_deadlock_counter
       Gitlab::Metrics.counter(:db_deadlock, 'Counts the times we have deadlocked in the database')
     end
-
-    def sync_traversal_ids_nowait?
-      Feature.enabled?(:sync_traversal_ids_nowait, Feature.current_request)
-    end
   end
 end

app/models/namespace/traversal_hierarchy.rb

@@ -49,10 +49,6 @@ class Packages::Package < ApplicationRecord
   has_many :nuget_symbols, inverse_of: :package, class_name: 'Packages::Nuget::Symbol'
   has_one :npm_metadatum, inverse_of: :package, class_name: 'Packages::Npm::Metadatum'
 
-  # TODO: Remove with the rollout of the FF terraform_extract_terraform_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/490007
-  has_one :terraform_module_metadatum, inverse_of: :package, class_name: 'Packages::TerraformModule::Metadatum'
-
   has_many :build_infos, inverse_of: :package
   has_many :pipelines, through: :build_infos, disable_joins: true
   has_many :matching_package_protection_rules, ->(package) { where(package_type: package.package_type).for_package_name(package.name) }, through: :project, source: :package_protection_rules
@@ -76,17 +72,11 @@ class Packages::Package < ApplicationRecord
   validates :name, format: { with: Gitlab::Regex.npm_package_name_regex, message: Gitlab::Regex.npm_package_name_regex_message }, if: :npm?
   validates :name, format: { with: Gitlab::Regex.nuget_package_name_regex }, if: :nuget?
 
-  # TODO: Remove with the rollout of the FF terraform_extract_terraform_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/490007
-  validates :name, format: { with: Gitlab::Regex.terraform_module_package_name_regex }, if: :terraform_module?
-
   validates :version, format: { with: Gitlab::Regex.nuget_version_regex }, if: :nuget?
   validates :version, format: { with: Gitlab::Regex.maven_version_regex }, if: -> { version? && maven? }
 
-  # TODO: Remove `terraform_module?` condition with the rollout of the FF terraform_extract_terraform_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/490007
   validates :version, format: { with: Gitlab::Regex.semver_regex, message: Gitlab::Regex.semver_regex_message },
-    if: -> { npm? || terraform_module? }
+    if: -> { npm? }
 
   scope :for_projects, ->(project_ids) { where(project_id: project_ids) }
   scope :with_name, ->(name) { where(name: name) }
@@ -177,7 +167,7 @@ class Packages::Package < ApplicationRecord
   def self.inheritance_column = 'package_type'
 
   def self.inheritance_column_to_class_map
-    hash = {
+    {
       ml_model: 'Packages::MlModel::Package',
       golang: 'Packages::Go::Package',
       rubygems: 'Packages::Rubygems::Package',
@@ -187,14 +177,9 @@ def self.inheritance_column_to_class_map
       composer: 'Packages::Composer::Package',
       helm: 'Packages::Helm::Package',
       generic: 'Packages::Generic::Package',
-      pypi: 'Packages::Pypi::Package'
-    }
-
-    if Feature.enabled?(:terraform_extract_terraform_package_model, Feature.current_request)
-      hash[:terraform_module] = 'Packages::TerraformModule::Package'
-    end
-
-    hash
+      pypi: 'Packages::Pypi::Package',
+      terraform_module: 'Packages::TerraformModule::Package'
+    }.freeze
   end
 
   def self.only_maven_packages_with_path(path, use_cte: false)

app/models/packages/package.rb

@@ -10,34 +10,15 @@ class Metadatum < ApplicationRecord
       MAX_FIELDS_SIZE = 10.megabytes
 
       belongs_to :package, class_name: 'Packages::TerraformModule::Package', inverse_of: :terraform_module_metadatum
-
-      # TODO: Remove with the rollout of the FF terraform_extract_terraform_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
-      belongs_to :legacy_package, -> {
-        where(package_type: :terraform_module)
-      }, inverse_of: :terraform_module_metadatum, class_name: 'Packages::Package', foreign_key: :package_id
-
       belongs_to :project
 
-      validates :package, presence: true, if: -> { terraform_extract_terraform_package_model_enabled? }
-
-      # TODO: Remove with the rollout of the FF terraform_extract_terraform_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
-      validates :legacy_package, presence: true, unless: -> { terraform_extract_terraform_package_model_enabled? }
-
+      validates :package, presence: true
       validates :project, :fields, presence: true
       validates :fields, json_schema: { filename: 'terraform_module_metadata', detail_errors: true }
-      validate :terraform_module_package_type, unless: -> { terraform_extract_terraform_package_model_enabled? }
       validate :ensure_fields_size
 
       private
 
-      def terraform_module_package_type
-        return if legacy_package&.terraform_module?
-
-        errors.add(:base, _('Package type must be Terraform Module'))
-      end
-
       def ensure_fields_size
         return if fields.to_s.size <= MAX_FIELDS_SIZE
 
@@ -47,11 +28,6 @@ def ensure_fields_size
           message: format(_('metadata is too large (maximum is %{max_size} characters)'), max_size: MAX_FIELDS_SIZE)
         )
       end
-
-      def terraform_extract_terraform_package_model_enabled?
-        Feature.enabled?(:terraform_extract_terraform_package_model, Feature.current_request)
-      end
-      strong_memoize_attr :terraform_extract_terraform_package_model_enabled?
     end
   end
 end

app/models/packages/terraform_module/metadatum.rb

@@ -11,18 +11,13 @@ def initialize(package, metadata_hash)
 
         def execute
           metadata = ::Packages::TerraformModule::Metadatum.new(
+            package: package,
             project: package.project,
             fields: metadata_hash,
             updated_at: Time.current,
             created_at: Time.current
           )
 
-          if Feature.enabled?(:terraform_extract_terraform_package_model, Feature.current_request)
-            metadata.package = package
-          else
-            metadata.legacy_package = package
-          end
-
           if metadata.valid?
             ::Packages::TerraformModule::Metadatum.upsert(metadata.attributes, returning: false)