Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -645,7 +645,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/api/templates/licenses.md @rdickenson
 /doc/api/todos.md @msedlakjakubowski
 /doc/api/topics.md @lciutacu
-/doc/api/usage_data.md @dianalogan
+/doc/api/usage_data.md @lciutacu
 /doc/api/users.md @jglassman1
 /doc/api/version.md @phillipwells
 /doc/api/visual_review_discussions.md @drcatherinepope
@@ -767,8 +767,8 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/development/sec/ @rdickenson
 /doc/development/sec/security_report_ingestion_overview.md @dianalogan
 /doc/development/secure_coding_guidelines.md @sselhorn
-/doc/development/service_ping/ @dianalogan
-/doc/development/snowplow/ @dianalogan
+/doc/development/service_ping/ @lciutacu
+/doc/development/snowplow/ @lciutacu
 /doc/development/spam_protection_and_captcha/ @phillipwells
 /doc/development/sql.md @aqualls
 /doc/development/testing_guide/ @sselhorn
@@ -864,11 +864,12 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /doc/user/admin_area/settings/rate_limit_on_issues_creation.md @msedlakjakubowski
 /doc/user/admin_area/settings/rate_limit_on_notes_creation.md @msedlakjakubowski
 /doc/user/admin_area/settings/rate_limit_on_pipelines_creation.md @drcatherinepope
+/doc/user/admin_area/settings/rate_limit_on_projects_api.md @lciutacu
 /doc/user/admin_area/settings/rate_limit_on_users_api.md @jglassman1
 /doc/user/admin_area/settings/scim_setup.md @jglassman1
 /doc/user/admin_area/settings/terraform_limits.md @phillipwells
 /doc/user/admin_area/settings/third_party_offers.md @lciutacu
-/doc/user/admin_area/settings/usage_statistics.md @dianalogan
+/doc/user/admin_area/settings/usage_statistics.md @lciutacu
 /doc/user/admin_area/settings/visibility_and_access_controls.md @aqualls
 /doc/user/analytics/ @lciutacu
 /doc/user/analytics/ci_cd_analytics.md @rdickenson

.rubocop_todo/rails/inverse_of.yml

@@ -1,13 +1,6 @@
 ---
 Rails/InverseOf:
   Exclude:
-    - 'app/models/alert_management/alert.rb'
-    - 'app/models/alert_management/alert_assignee.rb'
-    - 'app/models/application_setting.rb'
-    - 'app/models/audit_event.rb'
-    - 'app/models/board.rb'
-    - 'app/models/bulk_imports/entity.rb'
-    - 'app/models/bulk_imports/tracker.rb'
     - 'app/models/ci/build.rb'
     - 'app/models/ci/build_pending_state.rb'
     - 'app/models/ci/build_trace_chunk.rb'

app/assets/javascripts/search/sidebar/components/app.vue

@@ -27,7 +27,9 @@ export default {
 </script>
 
 <template>
-  <section class="search-sidebar gl-display-flex gl-flex-direction-column gl-mr-4 gl-mb-6 gl-mt-5">
+  <section
+    class="search-sidebar gl-display-flex gl-flex-direction-column gl-md-mr-5 gl-mb-6 gl-mt-5"
+  >
     <scope-navigation />
     <results-filters v-if="showIssueAndMergeFilters" />
     <language-filter v-if="showBlobFilter" />

app/assets/javascripts/search/topbar/components/app.vue

@@ -86,45 +86,50 @@ export default {
 </script>
 
 <template>
-  <section class="search-page-form gl-lg-display-flex gl-flex-direction-column">
-    <div class="gl-lg-display-flex gl-flex-direction-row gl-align-items-flex-end">
-      <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2">
-        <div
-          class="gl-sm-display-flex gl-flex-direction-row gl-justify-content-space-between gl-mb-4 gl-md-mb-0"
-        >
-          <label>{{ $options.i18n.searchLabel }}</label>
-          <template v-if="showSyntaxOptions">
-            <gl-button
-              category="tertiary"
-              variant="link"
-              size="small"
-              button-text-classes="gl-font-sm!"
-              @click="onToggleDrawer"
-              >{{ $options.i18n.syntaxOptionsLabel }}
-            </gl-button>
-            <markdown-drawer
-              ref="markdownDrawer"
-              :document-path="$options.SYNTAX_OPTIONS_DOCUMENT"
-            />
-          </template>
+  <section class="gl-p-5 gl-bg-gray-10 gl-border-b">
+    <div class="search-page-form gl-lg-display-flex gl-flex-direction-column">
+      <div class="gl-lg-display-flex gl-flex-direction-row gl-align-items-flex-end">
+        <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2">
+          <div
+            class="gl-display-flex gl-flex-direction-row gl-justify-content-space-between gl-mb-0 gl-md-mb-4"
+          >
+            <label class="gl-mb-1 gl-md-pb-2">{{ $options.i18n.searchLabel }}</label>
+            <template v-if="showSyntaxOptions">
+              <gl-button
+                category="tertiary"
+                variant="link"
+                size="small"
+                button-text-classes="gl-font-sm!"
+                @click="onToggleDrawer"
+                >{{ $options.i18n.syntaxOptionsLabel }}
+              </gl-button>
+              <markdown-drawer
+                ref="markdownDrawer"
+                :document-path="$options.SYNTAX_OPTIONS_DOCUMENT"
+              />
+            </template>
+          </div>
+          <gl-search-box-by-click
+            id="dashboard_search"
+            v-model="search"
+            name="search"
+            :placeholder="$options.i18n.searchPlaceholder"
+            @submit="applyQuery"
+          />
+        </div>
+        <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-3">
+          <label class="gl-display-block gl-mb-1 gl-md-pb-2">{{
+            $options.i18n.groupFieldLabel
+          }}</label>
+          <group-filter :initial-data="groupInitialJson" />
+        </div>
+        <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-ml-3">
+          <label class="gl-display-block gl-mb-1 gl-md-pb-2">{{
+            $options.i18n.projectFieldLabel
+          }}</label>
+          <project-filter :initial-data="projectInitialJson" />
         </div>
-        <gl-search-box-by-click
-          id="dashboard_search"
-          v-model="search"
-          name="search"
-          :placeholder="$options.i18n.searchPlaceholder"
-          @submit="applyQuery"
-        />
-      </div>
-      <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-3">
-        <label class="gl-display-block">{{ $options.i18n.groupFieldLabel }}</label>
-        <group-filter :initial-data="groupInitialJson" />
-      </div>
-      <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-ml-3">
-        <label class="gl-display-block">{{ $options.i18n.projectFieldLabel }}</label>
-        <project-filter :initial-data="projectInitialJson" />
       </div>
     </div>
-    <hr class="gl-mt-5 gl-mb-0 gl-border-gray-100" />
   </section>
 </template>

app/controllers/application_controller.rb

@@ -33,7 +33,6 @@ class ApplicationController < ActionController::Base
   before_action :check_password_expiration, if: :html_request?
   before_action :ldap_security_check
   before_action :default_headers
-  before_action :default_cache_headers
   before_action :add_gon_variables, if: :html_request?
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :require_email, unless: :devise_controller?
@@ -316,10 +315,6 @@ def default_headers
     headers['X-Content-Type-Options'] = 'nosniff'
   end
 
-  def default_cache_headers
-    headers['Pragma'] = 'no-cache' # HTTP 1.0 compatibility
-  end
-
   def stream_csv_headers(csv_filename)
     no_cache_headers
     stream_headers

app/controllers/concerns/uploads_actions.rb

@@ -9,7 +9,6 @@ module UploadsActions
 
   included do
     prepend_before_action :set_request_format_from_path_extension
-    skip_before_action :default_cache_headers, only: :show
     rescue_from FileUploader::InvalidSecret, with: :render_404
   end
 

app/controllers/projects/avatars_controller.rb

@@ -3,8 +3,6 @@
 class Projects::AvatarsController < Projects::ApplicationController
   include SendsBlob
 
-  skip_before_action :default_cache_headers, only: :show
-
   before_action :authorize_admin_project!, only: [:destroy]
 
   feature_category :projects

app/controllers/projects/design_management/designs/raw_images_controller.rb

@@ -7,8 +7,6 @@ module Designs
       class RawImagesController < Projects::DesignManagement::DesignsController
         include SendsBlob
 
-        skip_before_action :default_cache_headers, only: :show
-
         def show
           blob = design_repository.blob_at(ref, design.full_path)
 

app/controllers/projects/design_management/designs/resized_image_controller.rb

@@ -10,8 +10,6 @@ class ResizedImageController < Projects::DesignManagement::DesignsController
         before_action :validate_size!
         before_action :validate_sha!
 
-        skip_before_action :default_cache_headers, only: :show
-
         def show
           relation = design.actions
           relation = relation.up_to_version(version) if version

app/controllers/projects/raw_controller.rb

@@ -6,8 +6,6 @@ class Projects::RawController < Projects::ApplicationController
   include SendsBlob
   include StaticObjectExternalStorage
 
-  skip_before_action :default_cache_headers, only: :show
-
   prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:blob) }
 
   before_action :assign_ref_vars

app/controllers/projects/repositories_controller.rb

@@ -8,8 +8,6 @@ class Projects::RepositoriesController < Projects::ApplicationController
 
   prepend_before_action(only: [:archive]) { authenticate_sessionless_user!(:archive) }
 
-  skip_before_action :default_cache_headers, only: :archive
-
   # Authorize
   before_action :check_archive_rate_limiting!, only: :archive
   before_action :require_non_empty_project, except: :create

app/controllers/search_controller.rb

@@ -24,7 +24,6 @@ def self.search_rate_limited_endpoints
 
   before_action :block_anonymous_global_searches, :check_scope_global_search_enabled, except: :opensearch
   skip_before_action :authenticate_user!
-  skip_before_action :default_cache_headers, only: [:count, :autocomplete]
 
   requires_cross_project_access if: -> do
     search_term_present = params[:search].present? || params[:term].present?

app/models/alert_management/alert.rb

@@ -25,8 +25,9 @@ class Alert < ApplicationRecord
     has_many :assignees, through: :alert_assignees
 
     has_many :notes, as: :noteable, inverse_of: :noteable, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
-    has_many :ordered_notes, -> { fresh }, as: :noteable, class_name: 'Note'
-    has_many :user_mentions, class_name: 'AlertManagement::AlertUserMention', foreign_key: :alert_management_alert_id
+    has_many :ordered_notes, -> { fresh }, as: :noteable, class_name: 'Note', inverse_of: :noteable
+    has_many :user_mentions, class_name: 'AlertManagement::AlertUserMention', foreign_key: :alert_management_alert_id,
+      inverse_of: :alert
     has_many :metric_images, class_name: '::AlertManagement::MetricImage'
 
     has_internal_id :iid, scope: :project

app/models/alert_management/alert_assignee.rb

@@ -3,7 +3,7 @@
 module AlertManagement
   class AlertAssignee < ApplicationRecord
     belongs_to :alert, inverse_of: :alert_assignees
-    belongs_to :assignee, class_name: 'User', foreign_key: :user_id
+    belongs_to :assignee, class_name: 'User', foreign_key: :user_id, inverse_of: :alert_assignees
 
     validates :alert, presence: true
     validates :assignee, presence: true, uniqueness: { scope: :alert_id }

app/models/alert_management/alert_user_mention.rb

@@ -2,7 +2,10 @@
 
 module AlertManagement
   class AlertUserMention < UserMention
-    belongs_to :alert_management_alert, class_name: '::AlertManagement::Alert'
+    belongs_to :alert, class_name: '::AlertManagement::Alert',
+      foreign_key: :alert_management_alert_id,
+      inverse_of: :user_mentions
+
     belongs_to :note
   end
 end

app/models/application_setting.rb

@@ -30,11 +30,13 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord
   add_authentication_token_field :static_objects_external_storage_auth_token, encrypted: :required
   add_authentication_token_field :error_tracking_access_token, encrypted: :required
 
-  belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id'
+  belongs_to :self_monitoring_project, class_name: "Project", foreign_key: :instance_administration_project_id,
+    inverse_of: :application_setting
   belongs_to :push_rule
   alias_attribute :self_monitoring_project_id, :instance_administration_project_id
 
-  belongs_to :instance_group, class_name: "Group", foreign_key: 'instance_administrators_group_id'
+  belongs_to :instance_group, class_name: "Group", foreign_key: :instance_administrators_group_id,
+    inverse_of: :application_setting
   alias_attribute :instance_group_id, :instance_administrators_group_id
   alias_attribute :instance_administrators_group, :instance_group
   alias_attribute :housekeeping_optimize_repository_period, :housekeeping_incremental_repack_period

app/models/audit_event.rb

@@ -21,7 +21,7 @@ class AuditEvent < ApplicationRecord
 
   serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize
 
-  belongs_to :user, foreign_key: :author_id
+  belongs_to :user, foreign_key: :author_id, inverse_of: :audit_events
 
   validates :author_id, presence: true
   validates :entity_id, presence: true

app/models/board.rb

@@ -6,8 +6,8 @@ class Board < ApplicationRecord
   belongs_to :group
   belongs_to :project
 
-  has_many :lists, -> { ordered }, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
-  has_many :destroyable_lists, -> { destroyable.ordered }, class_name: "List"
+  has_many :lists, -> { ordered }, dependent: :delete_all, inverse_of: :board # rubocop:disable Cop/ActiveRecordDependent
+  has_many :destroyable_lists, -> { destroyable.ordered }, class_name: "List", inverse_of: :board
 
   validates :name, presence: true
   validates :project, presence: true, if: :project_needed?

app/models/bulk_imports/entity.rb

@@ -26,10 +26,11 @@ class BulkImports::Entity < ApplicationRecord
   belongs_to :parent, class_name: 'BulkImports::Entity', optional: true
 
   belongs_to :project, optional: true
-  belongs_to :group, foreign_key: :namespace_id, optional: true
+  belongs_to :group, foreign_key: :namespace_id, optional: true, inverse_of: :bulk_import_entities
 
   has_many :trackers,
     class_name: 'BulkImports::Tracker',
+    inverse_of: :entity,
     foreign_key: :bulk_import_entity_id
 
   has_many :failures,

app/models/bulk_imports/tracker.rb

@@ -7,6 +7,7 @@ class BulkImports::Tracker < ApplicationRecord
 
   belongs_to :entity,
     class_name: 'BulkImports::Entity',
+    inverse_of: :trackers,
     foreign_key: :bulk_import_entity_id,
     optional: false
 

app/models/group.rb

@@ -110,7 +110,10 @@ def of_ancestors_and_self
 
   has_one :import_state, class_name: 'GroupImportState', inverse_of: :group
 
+  has_many :application_setting, foreign_key: :instance_administrators_group_id, inverse_of: :instance_group
+
   has_many :bulk_import_exports, class_name: 'BulkImports::Export', inverse_of: :group
+  has_many :bulk_import_entities, class_name: 'BulkImports::Entity', foreign_key: :namespace_id, inverse_of: :group
 
   has_many :group_deploy_keys_groups, inverse_of: :group
   has_many :group_deploy_keys, through: :group_deploy_keys_groups

app/models/project.rb

@@ -167,6 +167,8 @@ class Project < ApplicationRecord
   has_one :last_event, -> { order 'events.created_at DESC' }, class_name: 'Event'
   has_many :boards
 
+  has_many :application_setting, inverse_of: :self_monitoring_project
+
   def self.integration_association_name(name)
     "#{name}_integration"
   end

app/models/user.rb

@@ -228,7 +228,9 @@ def update_tracked_fields!(request)
   has_many :notification_settings
   has_many :award_emoji,              dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :triggers,                 class_name: 'Ci::Trigger', foreign_key: :owner_id
+  has_many :audit_events, foreign_key: :author_id, inverse_of: :user
 
+  has_many :alert_assignees, class_name: '::AlertManagement::AlertAssignee', inverse_of: :assignee
   has_many :issue_assignees, inverse_of: :assignee
   has_many :merge_request_assignees, inverse_of: :assignee, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :merge_request_reviewers, inverse_of: :reviewer, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent

app/services/packages/mark_package_for_destruction_service.rb

@@ -13,7 +13,8 @@ def execute
       package.sync_maven_metadata(current_user)
 
       service_response_success('Package was successfully marked as pending destruction')
-    rescue StandardError
+    rescue StandardError => e
+      track_exception(e)
       service_response_error('Failed to mark the package as pending destruction', 400)
     end
 
@@ -30,5 +31,13 @@ def service_response_success(message)
     def user_can_delete_package?
       can?(current_user, :destroy_package, package.project)
     end
+
+    def track_exception(error)
+      Gitlab::ErrorTracking.track_exception(
+        error,
+        project_id: package.project_id,
+        package_id: package.id
+      )
+    end
   end
 end