Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/stylesheets/framework/emojis.scss

@@ -1,16 +1,15 @@
 gl-emoji {
   font-style: normal;
-  display: inline-flex;
+  display: inline-block;
   vertical-align: baseline;
   font-family: 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   font-size: 1.2em;
   line-height: 1;
 
   img {
-    width: 1.2em;
-    height: 1.2em;
-    position: relative;
-    top: 0.25em;
+    width: 1em;
+    object-fit: scale-down;
+    height: 1em;
   }
 }
 

app/assets/stylesheets/framework/variables.scss

@@ -508,8 +508,8 @@ $board-swimlanes-headers-height: 64px;
 /*
 Source Editor theme overrides
 */
-$source-editor-hover-light-text-color: #ececef;
-$source-editor-hover-dark-text-color: #333238;
+$source-editor-hover-light-text-color: $gl-color-neutral-50;
+$source-editor-hover-dark-text-color: $gl-color-neutral-900;
 
 /**
  Bootstrap 4.2.0 introduced new icons for validating forms.

app/models/packages/npm/metadatum.rb

@@ -15,10 +15,6 @@ class Packages::Npm::Metadatum < ApplicationRecord
 
   scope :package_id_in, ->(package_ids) { where(package_id: package_ids) }
 
-  def package_json_scripts
-    package_json.try(:[], 'scripts')
-  end
-
   private
 
   def ensure_npm_package_type

app/services/loose_foreign_keys/batch_cleaner_service.rb

@@ -5,12 +5,20 @@ class BatchCleanerService
     CLEANUP_ATTEMPTS_BEFORE_RESCHEDULE = 3
     CONSUME_AFTER_RESCHEDULE = 5.minutes
 
-    def initialize(parent_table:, loose_foreign_key_definitions:, deleted_parent_records:, connection:, modification_tracker: LooseForeignKeys::ModificationTracker.new)
+    def initialize(
+      parent_table:,
+      loose_foreign_key_definitions:,
+      deleted_parent_records:,
+      connection:,
+      logger: Sidekiq.logger,
+      modification_tracker: LooseForeignKeys::ModificationTracker.new
+    )
       @parent_table = parent_table
       @loose_foreign_key_definitions = loose_foreign_key_definitions
       @deleted_parent_records = deleted_parent_records
       @modification_tracker = modification_tracker
       @connection = connection
+      @logger = logger
       @deleted_records_counter = Gitlab::Metrics.counter(
         :loose_foreign_key_processed_deleted_records,
         'The number of processed loose foreign key deleted records'
@@ -54,7 +62,7 @@ def execute
 
     private
 
-    attr_reader :parent_table, :loose_foreign_key_definitions, :deleted_parent_records, :modification_tracker, :deleted_records_counter, :deleted_records_rescheduled_count, :deleted_records_incremented_count, :connection
+    attr_reader :parent_table, :loose_foreign_key_definitions, :deleted_parent_records, :modification_tracker, :deleted_records_counter, :deleted_records_rescheduled_count, :deleted_records_incremented_count, :connection, :logger
 
     def handle_over_limit
       records_to_reschedule = []
@@ -82,6 +90,9 @@ def record_result(cleaner, result)
         modification_tracker.add_deletions(result[:table], result[:affected_rows])
       elsif cleaner.async_nullify?
         modification_tracker.add_updates(result[:table], result[:affected_rows])
+      else
+        logger.error("Invalid on_delete argument for definition: #{result[:table]}")
+        false
       end
     end
 
@@ -104,14 +115,15 @@ def run_cleaner_service(loose_foreign_key_definition, with_skip_locked:)
           loose_foreign_key_definition: loose_foreign_key_definition,
           connection: base_model.connection,
           deleted_parent_records: deleted_parent_records,
-          with_skip_locked: with_skip_locked
+          with_skip_locked: with_skip_locked,
+          logger: logger
         )
 
         loop do
           result = cleaner.execute
-          record_result(cleaner, result)
+          recorded = record_result(cleaner, result)
 
-          break if modification_tracker.over_limit? || result[:affected_rows] == 0
+          break if modification_tracker.over_limit? || result[:affected_rows] == 0 || !recorded
         end
       end
     end

app/services/loose_foreign_keys/cleaner_service.rb

@@ -6,11 +6,12 @@ class CleanerService
     DELETE_LIMIT = 1000
     UPDATE_LIMIT = 500
 
-    def initialize(loose_foreign_key_definition:, connection:, deleted_parent_records:, with_skip_locked: false)
+    def initialize(loose_foreign_key_definition:, connection:, deleted_parent_records:, logger: Sidekiq.logger, with_skip_locked: false)
       @loose_foreign_key_definition = loose_foreign_key_definition
       @connection = connection
       @deleted_parent_records = deleted_parent_records
       @with_skip_locked = with_skip_locked
+      @logger = logger
     end
 
     def execute
@@ -29,19 +30,21 @@ def async_nullify?
 
     private
 
-    attr_reader :loose_foreign_key_definition, :connection, :deleted_parent_records, :with_skip_locked
+    attr_reader :loose_foreign_key_definition, :connection, :deleted_parent_records, :with_skip_locked, :logger
 
     def build_query
       query = if async_delete?
                 delete_query
               elsif async_nullify?
                 update_query
               else
-                raise "Invalid on_delete argument: #{loose_foreign_key_definition.on_delete}"
+                logger.error("Invalid on_delete argument: #{loose_foreign_key_definition.on_delete}")
+                return ""
               end
 
       unless query.include?(%{"#{loose_foreign_key_definition.column}" IN (})
-        raise("FATAL: foreign key condition is missing from the generated query: #{query}")
+        logger.error("FATAL: foreign key condition is missing from the generated query: #{query}")
+        return ""
       end
 
       query

app/services/loose_foreign_keys/process_deleted_records_service.rb

@@ -4,9 +4,10 @@ module LooseForeignKeys
   class ProcessDeletedRecordsService
     BATCH_SIZE = 1000
 
-    def initialize(connection:, modification_tracker: LooseForeignKeys::ModificationTracker.new)
+    def initialize(connection:, logger: Sidekiq.logger, modification_tracker: LooseForeignKeys::ModificationTracker.new)
       @connection = connection
       @modification_tracker = modification_tracker
+      @logger = logger
     end
 
     def execute
@@ -31,6 +32,7 @@ def execute
             loose_foreign_key_definitions: loose_foreign_key_definitions,
             deleted_parent_records: records,
             connection: connection,
+            logger: logger,
             modification_tracker: modification_tracker)
           .execute
 
@@ -55,7 +57,7 @@ def execute
 
     private
 
-    attr_reader :connection, :modification_tracker
+    attr_reader :connection, :logger, :modification_tracker
 
     def db_config_name
       ::Gitlab::Database.db_config_name(connection)

app/services/packages/npm/check_manifest_coherence_service.rb

@@ -9,9 +9,6 @@ class CheckManifestCoherenceService
       MANIFEST_NOT_COHERENT_ERROR = 'Package manifest is not coherent'
       VERSION_NOT_COMPLIANT_ERROR = 'Version in package.json is not SemVer compliant'
 
-      delegate :npm_metadatum, to: :package, private: true
-      delegate :package_json_scripts, to: :npm_metadatum, private: true, allow_nil: true
-
       def initialize(package, package_json_entry)
         @package = package
         @package_json_entry = package_json_entry
@@ -31,8 +28,7 @@ def execute
 
       def coherent?(package_json)
         package_json['name'] == package.name &&
-          same_version?(package_json['version'], package.version) &&
-          (package_json['scripts'] || {}) == (package_json_scripts || {})
+          same_version?(package_json['version'], package.version)
       end
 
       def same_version?(version1, version2)

app/views/admin/spam_logs/index.html.haml

@@ -16,4 +16,4 @@
         = render @spam_logs
   = paginate_collection @spam_logs
 - else
-  %h4= _('There are no Spam Logs')
+  %h4= _('There are no spam logs')

app/workers/loose_foreign_keys/cleanup_worker.rb

@@ -22,7 +22,8 @@ def perform
       in_lock(self.class.name.underscore, ttl: lock_ttl, retries: 0) do
         stats = ProcessDeletedRecordsService.new(
           connection: base_model.connection,
-          modification_tracker: modification_tracker
+          modification_tracker: modification_tracker,
+          logger: Sidekiq.logger
         ).execute
         stats[:connection] = connection_name
         stats[:turbo_mode] = turbo_mode

db/docs/sbom_sources.yml

@@ -7,5 +7,5 @@ feature_categories:
 description: Stores information about where an SBoM component originated from
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90812
 milestone: '15.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_sec
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/457096

db/migrate/20240708074520_add_scan_status_to_scan_result_policy_violation.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddScanStatusToScanResultPolicyViolation < Gitlab::Database::Migration[2.2]
+  milestone '17.2'
+
+  def up
+    with_lock_retries do
+      add_column :scan_result_policy_violations,
+        :status, :integer, null: false, limit: 2, default: 1
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :scan_result_policy_violations,
+        :status, :integer
+    end
+  end
+end

db/schema_migrations/20240708074520

@@ -0,0 +1 @@
+1100281c2adaaeaa03d97f6a6b43a1bbe2d29bb1702e0ff541d29a15926d1faa

db/structure.sql

@@ -17192,7 +17192,8 @@ CREATE TABLE scan_result_policy_violations (
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     violation_data jsonb,
-    approval_policy_rule_id bigint
+    approval_policy_rule_id bigint,
+    status smallint DEFAULT 1 NOT NULL
 );
 
 CREATE SEQUENCE scan_result_policy_violations_id_seq
@@ -21208,8 +21209,6 @@ ALTER TABLE ONLY p_catalog_resource_sync_events ALTER COLUMN id SET DEFAULT next
 
 ALTER TABLE ONLY p_ci_builds_metadata ALTER COLUMN id SET DEFAULT nextval('ci_builds_metadata_id_seq'::regclass);
 
-ALTER TABLE ONLY p_ci_job_annotations ALTER COLUMN id SET DEFAULT nextval('p_ci_job_annotations_id_seq'::regclass);
-
 ALTER TABLE ONLY packages_build_infos ALTER COLUMN id SET DEFAULT nextval('packages_build_infos_id_seq'::regclass);
 
 ALTER TABLE ONLY packages_composer_cache_files ALTER COLUMN id SET DEFAULT nextval('packages_composer_cache_files_id_seq'::regclass);

doc/administration/review_spam_logs.md

@@ -23,7 +23,7 @@ View and resolve spam logs to moderate user activity in your instance.
 To view spam logs:
 
 1. On the left sidebar, at the bottom, select **Admin area**.
-1. Select **Spam Logs**.
+1. Select **Spam logs**.
 1. Optional. To resolve a spam log, select **More actions** (**{ellipsis_v}**), then **Remove user**, **Block user**, **Remove log**, or **Trust user**.
 
 ### Resolving spam logs

doc/ci/yaml/index.md

@@ -848,7 +848,7 @@ to a pipeline with `include`. Use `include:inputs` to define the values to use w
 
 Use the inputs to customize the behavior of the configuration when included in CI/CD configuration.
 
-Use the interpolation format `$[[ input.input-id ]]` to reference the values outside of the header section.
+Use the interpolation format `$[[ inputs.input-id ]]` to reference the values outside of the header section.
 Inputs are evaluated and interpolated when the configuration is fetched during pipeline creation, but before the
 configuration is merged with the contents of the `.gitlab-ci.yml` file.
 

doc/development/documentation/styleguide/word_list.md

@@ -879,13 +879,6 @@ do not say:
 
 You can use **GA** to indicate general availability if you spell it out on first use.
 
-## Git suggestions
-
-Use sentence case for **Git suggestions**.
-
-On first mention on a page, use **GitLab Duo Git suggestions**.
-Thereafter, use **Git suggestions** by itself.
-
 ## GitLab
 
 Do not make **GitLab** possessive (GitLab's). This guidance follows [GitLab Trademark Guidelines](https://handbook.gitlab.com/handbook/marketing/brand-and-product-marketing/brand/brand-activation/trademark-guidelines/).
@@ -916,7 +909,7 @@ the following are the names of GitLab Duo features:
 - GitLab Duo Vulnerability explanation
 - GitLab Duo Vulnerability resolution
 - GitLab Duo Test generation
-- GitLab Duo Git suggestions
+- GitLab Duo for the CLI
 - GitLab Duo Root cause analysis
 - GitLab Duo Issue description generation
 

doc/development/spam_protection_and_captcha/index.md

@@ -50,4 +50,4 @@ The possible values include:
 - [Spam and CAPTCHA support in the GraphQL API](../../api/graphql/index.md#resolve-mutations-detected-as-spam)
 - [Spam and CAPTCHA support in the REST API](../../api/rest/index.md#resolve-requests-detected-as-spam)
 - [reCAPTCHA Spam and Anti-bot Protection](../../integration/recaptcha.md)
-- [Akismet and Spam Logs](../../integration/akismet.md)
+- [Akismet and spam logs](../../integration/akismet.md)

doc/development/spam_protection_and_captcha/model_and_services.md

@@ -57,7 +57,7 @@ To do this:
 
 The `SpammableActions::AkismetMarkAsSpamAction` module adds support for a `#mark_as_spam` action
 to a controller. This controller allows administrators to manage spam for the associated
-`Spammable` model in the [Spam Log section](../../integration/akismet.md) of the Admin area page.
+`Spammable` model in the [**Spam log** section](../../integration/akismet.md) of the Admin area page.
 
 1. Include the `SpammableActions::AkismetMarkAsSpamAction` module in the controller.
 

doc/integration/akismet.md

@@ -15,7 +15,7 @@ spam issues on public projects. Issues created through the web UI or the API can
 Akismet for review, and instance administrators can
 [mark snippets as spam](../user/snippets.md#mark-snippet-as-spam).
 
-Detected spam is rejected, and an entry is added in the **Spam Log** section of the
+Detected spam is rejected, and an entry is added in the **Spam log** section of the
 Admin area.
 
 Privacy note: GitLab submits the user's IP and user agent to Akismet.
@@ -56,12 +56,12 @@ DETAILS:
 To better differentiate between spam and ham, you can train the Akismet
 filter whenever there is a false positive or false negative.
 
-When an entry is recognized as spam, it is rejected and added to the Spam Logs.
+When an entry is recognized as spam, it is rejected and added to the spam logs.
 From here you can review if entries are really spam. If one of them is not really
 spam, you can use the **Submit as ham** button to tell Akismet that it falsely
 recognized an entry as spam.
 
-![Screenshot of Spam Logs](img/spam_log.png)
+![Screenshot of spam logs](img/spam_log.png)
 
 If an entry that is actually spam was not recognized as such, you can also submit
 this information to Akismet. The **Submit as spam** button is only displayed

doc/security/hardening_nist_800_53.md

@@ -161,7 +161,7 @@ requirements:
     FedRAMP requires organizations to monitor accounts for atypical use
     (AC-2(12)). GitLab empowers users to flag abuse in abuse reports,
     where administrators can remove access pending investigation. Spam
-    logs are consolidated in the Spam Logs section of the Admin area.
+    logs are consolidated in the **Spam logs** section of the Admin area.
     Administrators can remove, block, or trust users flagged in that
     area.
 

doc/tutorials/observability/observability_rails_tutorial.md

@@ -97,10 +97,10 @@ To create an application:
 
 1. Find your group ID:
    1. On the left sidebar, select **Search or go to** and find the top-level group with the `animal` project. For example, if your project URL is `https://gitlab.com/tankui/observability/animal`, the top-level group is `tanuki`.
-   1. On the group overview page, in the upper-right corner, select **Actions ({ellipsis_v})**.
+   1. On the group overview page, in the upper-right corner, select **Actions** (**{ellipsis_v}**).
    1. Select **Copy group ID**. Save the copied ID for later.
 1. Find your project ID:
-   1. On the `animal` project overview page, in the upper-right corner, select **Actions ({ellipsis_v})**.
+   1. On the `animal` project overview page, in the upper-right corner, select **Actions** (**{ellipsis_v}**).
    1. Select **Copy project ID**. Save the copied ID for later.
 
 1. Edit `.env` and add the following code:

lib/gitlab/themes.rb

@@ -26,7 +26,7 @@ def available_themes
         Theme.new(8, s_('NavigationTheme|Light Green'), 'ui-light-green', '#1b653f'),
         Theme.new(9, s_('NavigationTheme|Red'), 'ui-red', '#580d02'),
         Theme.new(10, s_('NavigationTheme|Light Red'), 'ui-light-red', '#a02e1c'),
-        Theme.new(2, s_('NavigationTheme|Gray'), 'ui-gray', '#333238'),
+        Theme.new(2, s_('NavigationTheme|Gray'), 'ui-gray', '#28272d'),
         Theme.new(3, s_('NavigationTheme|Neutral'), 'ui-neutral', '#ececef')
       ]
     end

locale/gitlab.pot

@@ -53647,9 +53647,6 @@ msgstr ""
 msgid "There are no SSH keys with access to your account."
 msgstr ""
 
-msgid "There are no Spam Logs"
-msgstr ""
-
 msgid "There are no approval rules for the given `represent_as` parameter. Use a valid User/Group/Role name instead."
 msgstr ""
 
@@ -53716,6 +53713,9 @@ msgstr ""
 msgid "There are no secure files yet."
 msgstr ""
 
+msgid "There are no spam logs"
+msgstr ""
+
 msgid "There are no topics to show"
 msgstr ""