Add latest changes from gitlab-org/gitlab@master

13 files changed, 94 insertions, 92 deletions

diff --git a/lib/gitlab/ci/parsers/sbom/source/dependency_scanning.rb b/lib/gitlab/ci/parsers/sbom/source/dependency_scanning.rb
index 00ca723b258..c76a4309779 100644
--- a/lib/gitlab/ci/parsers/sbom/source/dependency_scanning.rb
+++ b/lib/gitlab/ci/parsers/sbom/source/dependency_scanning.rb
@@ -23,8 +23,7 @@ module Gitlab
 
               ::Gitlab::Ci::Reports::Sbom::Source.new(
                 type: :dependency_scanning,
-                data: data,
-                fingerprint: fingerprint
+                data: data
               )
             end
 
@@ -37,10 +36,6 @@ module Gitlab
                 data.dig(*keys).present?
               end
             end
-
-            def fingerprint
-              Digest::SHA256.hexdigest(data.to_json)
-            end
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/duration.rb b/lib/gitlab/ci/pipeline/duration.rb
index de24bbf688b..e8a991026b5 100644
--- a/lib/gitlab/ci/pipeline/duration.rb
+++ b/lib/gitlab/ci/pipeline/duration.rb
@@ -91,7 +91,7 @@ module Gitlab
         # rubocop: disable CodeReuse/ActiveRecord
         def from_pipeline(pipeline)
           status = %w[success failed running canceled]
-          builds = pipeline.builds.latest
+          builds = pipeline.processables.latest
             .where(status: status).where.not(started_at: nil).order(:started_at)
 
           from_builds(builds)
diff --git a/lib/gitlab/ci/processable_object_hierarchy.rb b/lib/gitlab/ci/processable_object_hierarchy.rb
index 1122361e27e..c1531c3f4ab 100644
--- a/lib/gitlab/ci/processable_object_hierarchy.rb
+++ b/lib/gitlab/ci/processable_object_hierarchy.rb
@@ -20,12 +20,16 @@ module Gitlab
       def ancestor_conditions(cte)
         middle_table[:name].eq(objects_table[:name]).and(
           middle_table[:build_id].eq(cte.table[:id])
+        ).and(
+          objects_table[:commit_id].eq(cte.table[:commit_id])
         )
       end
 
       def descendant_conditions(cte)
         middle_table[:build_id].eq(objects_table[:id]).and(
           middle_table[:name].eq(cte.table[:name])
+        ).and(
+          objects_table[:commit_id].eq(cte.table[:commit_id])
         )
       end
     end
diff --git a/lib/gitlab/ci/reports/sbom/source.rb b/lib/gitlab/ci/reports/sbom/source.rb
index ea0fb8d4fbb..fbb8644c1b0 100644
--- a/lib/gitlab/ci/reports/sbom/source.rb
+++ b/lib/gitlab/ci/reports/sbom/source.rb
@@ -5,12 +5,11 @@ module Gitlab
     module Reports
       module Sbom
         class Source
-          attr_reader :source_type, :data, :fingerprint
+          attr_reader :source_type, :data
 
-          def initialize(type:, data:, fingerprint:)
+          def initialize(type:, data:)
             @source_type = type
             @data = data
-            @fingerprint = fingerprint
           end
         end
       end
diff --git a/lib/gitlab/email/message/in_product_marketing/verify.rb b/lib/gitlab/email/message/in_product_marketing/verify.rb
index d2a78b53e1f..3982a8b87fd 100644
--- a/lib/gitlab/email/message/in_product_marketing/verify.rb
+++ b/lib/gitlab/email/message/in_product_marketing/verify.rb
@@ -49,10 +49,10 @@ module Gitlab
             [
               nil,
               list([
-                s_('InProductMarketing|Start by %{performance_link}').html_safe % { performance_link: performance_link },
-                s_('InProductMarketing|Move on to easily creating a Pages website %{ci_template_link}').html_safe % { ci_template_link: ci_template_link },
-                s_('InProductMarketing|And finally %{deploy_link} a Python application.').html_safe % { deploy_link: deploy_link }
-              ]),
+                     s_('InProductMarketing|Start by %{performance_link}').html_safe % { performance_link: performance_link },
+                     s_('InProductMarketing|Move on to easily creating a Pages website %{ci_template_link}').html_safe % { ci_template_link: ci_template_link },
+                     s_('InProductMarketing|And finally %{deploy_link} a Python application.').html_safe % { deploy_link: deploy_link }
+                   ]),
               nil
             ][series]
           end
diff --git a/lib/gitlab/import_export/base/relation_factory.rb b/lib/gitlab/import_export/base/relation_factory.rb
index bbec473d29d..b05d9cb2489 100644
--- a/lib/gitlab/import_export/base/relation_factory.rb
+++ b/lib/gitlab/import_export/base/relation_factory.rb
@@ -15,19 +15,19 @@ module Gitlab
         UNIQUE_RELATIONS = %i[].freeze
 
         USER_REFERENCES = %w[
-           author_id
-           assignee_id
-           updated_by_id
-           merged_by_id
-           latest_closed_by_id
-           user_id
-           created_by_id
-           last_edited_by_id
-           merge_user_id
-           resolved_by_id
-           closed_by_id
-           owner_id
-         ].freeze
+          author_id
+          assignee_id
+          updated_by_id
+          merged_by_id
+          latest_closed_by_id
+          user_id
+          created_by_id
+          last_edited_by_id
+          merge_user_id
+          resolved_by_id
+          closed_by_id
+          owner_id
+        ].freeze
 
         TOKEN_RESET_MODELS = %i[Project Namespace Group Ci::Trigger Ci::Build Ci::Runner ProjectHook ErrorTracking::ProjectErrorTrackingSetting].freeze
 
diff --git a/lib/gitlab/import_export/json/streaming_serializer.rb b/lib/gitlab/import_export/json/streaming_serializer.rb
index 99396d64779..cf62f181366 100644
--- a/lib/gitlab/import_export/json/streaming_serializer.rb
+++ b/lib/gitlab/import_export/json/streaming_serializer.rb
@@ -175,21 +175,22 @@ module Gitlab
           order_expression = arel_table[column].public_send(direction).public_send(nulls_position) # rubocop:disable GitlabSecurity/PublicSend
           reverse_order_expression = arel_table[column].public_send(reverse_direction).public_send(reverse_nulls_position) # rubocop:disable GitlabSecurity/PublicSend
 
-          ::Gitlab::Pagination::Keyset::Order.build([
-            ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: column,
-              column_expression: arel_table[column],
-              order_expression: order_expression,
-              reversed_order_expression: reverse_order_expression,
-              order_direction: direction,
-              nullable: nulls_position,
-              distinct: false
-            ),
-            ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: klass.primary_key,
-              order_expression: arel_order_classes[direction].new(arel_table[klass.primary_key.to_sym])
-            )
-          ])
+          ::Gitlab::Pagination::Keyset::Order.build(
+            [
+              ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: column,
+                column_expression: arel_table[column],
+                order_expression: order_expression,
+                reversed_order_expression: reverse_order_expression,
+                order_direction: direction,
+                nullable: nulls_position,
+                distinct: false
+              ),
+              ::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: klass.primary_key,
+                order_expression: arel_order_classes[direction].new(arel_table[klass.primary_key.to_sym])
+              )
+            ])
         end
 
         def read_from_replica_if_available(&block)
diff --git a/lib/gitlab/kroki.rb b/lib/gitlab/kroki.rb
index fa10e922c80..6799be8e279 100644
--- a/lib/gitlab/kroki.rb
+++ b/lib/gitlab/kroki.rb
@@ -6,13 +6,13 @@ module Gitlab
   # Helper methods for Kroki
   module Kroki
     BLOCKDIAG_FORMATS = %w[
-        blockdiag
-        seqdiag
-        actdiag
-        nwdiag
-        packetdiag
-        rackdiag
-      ].freeze
+      blockdiag
+      seqdiag
+      actdiag
+      nwdiag
+      packetdiag
+      rackdiag
+    ].freeze
     DIAGRAMS_FORMATS = (::AsciidoctorExtensions::Kroki::SUPPORTED_DIAGRAM_NAMES - %w(mermaid)).freeze
     DIAGRAMS_FORMATS_WO_PLANTUML = (DIAGRAMS_FORMATS - %w(plantuml)).freeze
 
diff --git a/lib/gitlab/object_hierarchy.rb b/lib/gitlab/object_hierarchy.rb
index 0576aed811c..12d4d9d8928 100644
--- a/lib/gitlab/object_hierarchy.rb
+++ b/lib/gitlab/object_hierarchy.rb
@@ -138,9 +138,9 @@ module Gitlab
         .with
         .recursive(ancestors.to_arel, descendants.to_arel)
         .from_union([
-          ancestors_scope,
-          descendants_scope
-        ])
+                      ancestors_scope,
+                      descendants_scope
+                    ])
 
       read_only(relation)
     end
diff --git a/lib/gitlab/pagination/keyset/simple_order_builder.rb b/lib/gitlab/pagination/keyset/simple_order_builder.rb
index c36bd497aa3..318720c77d1 100644
--- a/lib/gitlab/pagination/keyset/simple_order_builder.rb
+++ b/lib/gitlab/pagination/keyset/simple_order_builder.rb
@@ -129,28 +129,31 @@ module Gitlab
         end
 
         def primary_key_descending_order
-          Gitlab::Pagination::Keyset::Order.build([
-            Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: model_class.primary_key,
-              order_expression: arel_table[primary_key].desc
-            )
-          ])
+          Gitlab::Pagination::Keyset::Order.build(
+            [
+              Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: model_class.primary_key,
+                order_expression: arel_table[primary_key].desc
+              )
+            ])
         end
 
         def primary_key_order
-          Gitlab::Pagination::Keyset::Order.build([
-            Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: model_class.primary_key,
-              order_expression: order_values.first
-            )
-          ])
+          Gitlab::Pagination::Keyset::Order.build(
+            [
+              Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: model_class.primary_key,
+                order_expression: order_values.first
+              )
+            ])
         end
 
         def column_with_tie_breaker_order(tie_breaker_column_order = default_tie_breaker_column_order)
-          Gitlab::Pagination::Keyset::Order.build([
-            column(order_values.first),
-            tie_breaker_column_order
-          ])
+          Gitlab::Pagination::Keyset::Order.build(
+            [
+              column(order_values.first),
+              tie_breaker_column_order
+            ])
         end
 
         def column(order_value)
diff --git a/lib/gitlab/project_authorizations.rb b/lib/gitlab/project_authorizations.rb
index 1d7b179baf0..da3f67dde51 100644
--- a/lib/gitlab/project_authorizations.rb
+++ b/lib/gitlab/project_authorizations.rb
@@ -37,9 +37,9 @@ module Gitlab
         Namespace
           .unscoped
           .select([
-            links[:project_id],
-            least(cte_alias[:access_level], links[:group_access], 'access_level')
-          ])
+                    links[:project_id],
+                    least(cte_alias[:access_level], links[:group_access], 'access_level')
+                  ])
           .from(cte_alias)
           .joins('INNER JOIN project_group_links ON project_group_links.group_id = namespaces.id')
           .joins('INNER JOIN projects ON projects.id = project_group_links.project_id')
@@ -79,9 +79,9 @@ module Gitlab
 
       # Sub groups of any groups the user is a member of.
       cte << Group.select([
-          namespaces[:id],
-          greatest(members[:access_level], cte.table[:access_level], 'access_level')
-        ])
+                            namespaces[:id],
+                            greatest(members[:access_level], cte.table[:access_level], 'access_level')
+                          ])
         .joins(join_cte(cte))
         .joins(join_members_on_namespaces)
         .except(:order)
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index e2232dc5e2a..9f836ec5319 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -21,18 +21,18 @@ module Gitlab
     MAX_GENERATION_TIME_FOR_SAAS = 40.hours
 
     CE_MEMOIZED_VALUES = %i(
-        issue_minimum_id
-        issue_maximum_id
-        project_minimum_id
-        project_maximum_id
-        user_minimum_id
-        user_maximum_id
-        deployment_minimum_id
-        deployment_maximum_id
-        auth_providers
-        aggregated_metrics
-        recorded_at
-      ).freeze
+      issue_minimum_id
+      issue_maximum_id
+      project_minimum_id
+      project_maximum_id
+      user_minimum_id
+      user_maximum_id
+      deployment_minimum_id
+      deployment_maximum_id
+      auth_providers
+      aggregated_metrics
+      recorded_at
+    ).freeze
 
     class << self
       include Gitlab::Utils::UsageData
diff --git a/lib/gitlab/usage_data_counters.rb b/lib/gitlab/usage_data_counters.rb
index eae1c593a8f..3cdb1e13096 100644
--- a/lib/gitlab/usage_data_counters.rb
+++ b/lib/gitlab/usage_data_counters.rb
@@ -3,13 +3,8 @@
 module Gitlab
   module UsageDataCounters
     COUNTERS = [
-      WikiPageCounter,
       NoteCounter,
-      SnippetCounter,
       SearchCounter,
-      CycleAnalyticsCounter,
-      ProductivityAnalyticsCounter,
-      SourceCodeCounter,
       KubernetesAgentCounter,
       MergeRequestWidgetExtensionCounter
     ].freeze
@@ -20,7 +15,12 @@ module Gitlab
       DesignsCounter,
       DiffsCounter,
       ServiceUsageDataCounter,
-      WebIdeCounter
+      WebIdeCounter,
+      WikiPageCounter,
+      SnippetCounter,
+      CycleAnalyticsCounter,
+      ProductivityAnalyticsCounter,
+      SourceCodeCounter
     ].freeze
 
     UsageDataCounterError = Class.new(StandardError)