Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

DUO_WORKFLOW_EXECUTOR_VERSION

@@ -1 +1 @@
-v0.0.12
+v0.0.13

GITALY_SERVER_VERSION

@@ -1 +1 @@
-3f12b41f93ded89c6ee7843526bf5529982250af
+6175a5f017f01e11959045c0dc24d9ca237865e6

app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_agent_info.vue

@@ -33,7 +33,6 @@ export default {
   methods: {},
   i18n: {
     agentId: s__('ClusterAgents|Agent ID #%{agentId}'),
-    neverConnectedText: s__('ClusterAgents|Never'),
   },
   AGENT_STATUSES,
 };
@@ -56,7 +55,6 @@ export default {
 
     <span data-testid="agent-last-used-date">
       <time-ago-tooltip v-if="agentLastContact" :time="agentLastContact" />
-      <span v-else>{{ $options.i18n.neverConnectedText }}</span>
     </span>
   </div>
 </template>

app/controllers/jwks_controller.rb

@@ -11,7 +11,7 @@ def keys
 
   def payload
     [
-      Rails.application.secrets.openid_connect_signing_key,
+      Rails.application.credentials.openid_connect_signing_key,
       Gitlab::CurrentSettings.ci_jwt_signing_key
     ].compact.map do |key_data|
       OpenSSL::PKey::RSA.new(key_data)

app/models/concerns/base_label.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module BaseLabel # rubocop:disable Gitlab/BoundedContexts -- existing Label modules/classes are not bounded
+  extend ActiveSupport::Concern
+
+  DEFAULT_COLOR = ::Gitlab::Color.of('#6699cc')
+
+  included do
+    include CacheMarkdownField
+    include Gitlab::SQL::Pattern
+
+    cache_markdown_field :description, pipeline: :single_line
+
+    attribute :color, ::Gitlab::Database::Type::Color.new, default: DEFAULT_COLOR
+
+    before_validation :strip_whitespace_from_title
+
+    validates :color, color: true, presence: true
+
+    # Don't allow ',' for label titles
+    validates :title, presence: true, format: { with: /\A[^,]+\z/ }
+    validates :title, length: { maximum: 255 }
+
+    # Searches for labels with a matching title or description.
+    #
+    # This method uses ILIKE on PostgreSQL.
+    #
+    # query - The search query as a String.
+    #
+    # Returns an ActiveRecord::Relation.
+    def self.search(query, **options)
+      # make sure we prevent passing in disallowed columns
+      search_in = case options[:search_in]
+                  when [:title]
+                    [:title]
+                  when [:description]
+                    [:description]
+                  else
+                    [:title, :description]
+                  end
+
+      fuzzy_search(query, search_in)
+    end
+
+    # Override Gitlab::SQL::Pattern.min_chars_for_partial_matching as
+    # label queries are never global, and so will not use a trigram
+    # index. That means we can have just one character in the LIKE.
+    def self.min_chars_for_partial_matching
+      1
+    end
+
+    def color
+      super || DEFAULT_COLOR
+    end
+
+    def text_color
+      color.contrast
+    end
+
+    def title=(value)
+      if value.blank?
+        super
+      else
+        write_attribute(:title, sanitize_value(value))
+      end
+    end
+
+    def description=(value)
+      if value.blank?
+        super
+      else
+        write_attribute(:description, sanitize_value(value))
+      end
+    end
+
+    private
+
+    def sanitize_value(value)
+      CGI.unescapeHTML(Sanitize.clean(value.to_s))
+    end
+
+    def strip_whitespace_from_title
+      self[:title] = title&.strip
+    end
+  end
+end

app/models/label.rb

@@ -1,39 +1,27 @@
 # frozen_string_literal: true
 
 class Label < ApplicationRecord
-  include CacheMarkdownField
+  include BaseLabel
   include Referable
   include Subscribable
-  include Gitlab::SQL::Pattern
   include OptionallySearch
   include Sortable
   include FromUnion
   include Presentable
   include EachBatch
 
-  cache_markdown_field :description, pipeline: :single_line
-
-  DEFAULT_COLOR = ::Gitlab::Color.of('#6699cc')
   DESCRIPTION_LENGTH_MAX = 512.kilobytes
 
-  attribute :color, ::Gitlab::Database::Type::Color.new, default: DEFAULT_COLOR
-
   has_many :lists, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :priorities, class_name: 'LabelPriority'
   has_many :label_links, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :issues, through: :label_links, source: :target, source_type: 'Issue'
   has_many :merge_requests, through: :label_links, source: :target, source_type: 'MergeRequest'
 
-  before_validation :strip_whitespace_from_title
   before_destroy :prevent_locked_label_destroy, prepend: true
 
-  validates :color, color: true, presence: true
   validate :ensure_lock_on_merge_allowed
-
-  # Don't allow ',' for label titles
-  validates :title, presence: true, format: { with: /\A[^,]+\z/ }
   validates :title, uniqueness: { scope: [:group_id, :project_id] }
-  validates :title, length: { maximum: 255 }
 
   # we validate the description against DESCRIPTION_LENGTH_MAX only for labels being created and on updates if
   # the description changes to avoid breaking the existing labels which may have their descriptions longer
@@ -182,34 +170,6 @@ def self.ids_on_board(board_id)
     on_board(board_id).pluck(:label_id)
   end
 
-  # Searches for labels with a matching title or description.
-  #
-  # This method uses ILIKE on PostgreSQL.
-  #
-  # query - The search query as a String.
-  #
-  # Returns an ActiveRecord::Relation.
-  def self.search(query, **options)
-    # make sure we prevent passing in disallowed columns
-    search_in = case options[:search_in]
-                when [:title]
-                  [:title]
-                when [:description]
-                  [:description]
-                else
-                  [:title, :description]
-                end
-
-    fuzzy_search(query, search_in)
-  end
-
-  # Override Gitlab::SQL::Pattern.min_chars_for_partial_matching as
-  # label queries are never global, and so will not use a trigram
-  # index. That means we can have just one character in the LIKE.
-  def self.min_chars_for_partial_matching
-    1
-  end
-
   def self.on_project_board?(project_id, label_id)
     return false if label_id.blank?
 
@@ -259,30 +219,6 @@ def priority?
     priorities.present?
   end
 
-  def color
-    super || DEFAULT_COLOR
-  end
-
-  def text_color
-    color.contrast
-  end
-
-  def title=(value)
-    if value.blank?
-      super
-    else
-      write_attribute(:title, sanitize_value(value))
-    end
-  end
-
-  def description=(value)
-    if value.blank?
-      super
-    else
-      write_attribute(:description, sanitize_value(value))
-    end
-  end
-
   ##
   # Returns the String necessary to reference this Label in Markdown
   #
@@ -362,14 +298,6 @@ def label_format_reference(format = :id)
     end
   end
 
-  def sanitize_value(value)
-    CGI.unescapeHTML(Sanitize.clean(value.to_s))
-  end
-
-  def strip_whitespace_from_title
-    self[:title] = title&.strip
-  end
-
   def prevent_locked_label_destroy
     return unless lock_on_merge
 

app/models/project_statistics.rb

@@ -2,13 +2,16 @@
 
 class ProjectStatistics < ApplicationRecord
   include CounterAttribute
+  include IgnorableColumns
 
   belongs_to :project
   belongs_to :namespace
 
   attribute :wiki_size, default: 0
   attribute :snippets_size, default: 0
 
+  ignore_column :vulnerability_count, remove_with: '17.7', remove_after: '2024-11-15'
+
   counter_attribute :build_artifacts_size
   counter_attribute :packages_size
 

app/models/user.rb

@@ -95,13 +95,13 @@ class User < ApplicationRecord
   attribute :color_mode_id, default: -> { Gitlab::ColorModes::APPLICATION_DEFAULT }
 
   attr_encrypted :otp_secret,
-    key: Gitlab::Application.secrets.otp_key_base,
+    key: Gitlab::Application.credentials.otp_key_base,
     mode: :per_attribute_iv_and_salt,
     insecure_mode: true,
     algorithm: 'aes-256-cbc'
 
   devise :two_factor_authenticatable,
-    otp_secret_encryption_key: Gitlab::Application.secrets.otp_key_base
+    otp_secret_encryption_key: Gitlab::Application.credentials.otp_key_base
 
   devise :two_factor_backupable, otp_number_of_backup_codes: 10
   devise :two_factor_backupable_pbkdf2

app/uploaders/terraform/state_uploader.rb

@@ -40,7 +40,7 @@ def store_dir
     end
 
     def key
-      OpenSSL::HMAC.digest('SHA256', Gitlab::Application.secrets.db_key_base, project_id.to_s)
+      OpenSSL::HMAC.digest('SHA256', Gitlab::Application.credentials.db_key_base, project_id.to_s)
     end
 
     class << self

config/feature_flags/beta/batched_redis_updates_for_kubernetes_agent_events.yml

@@ -0,0 +1,9 @@
+---
+name: batched_redis_updates_for_kubernetes_agent_events
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/497665
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168192
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/498416
+milestone: '17.5'
+group: group::analytics instrumentation
+type: beta
+default_enabled: false

config/initializers/00_deprecations.rb

@@ -18,7 +18,6 @@
 deprecators.silenced = silenced
 
 ignored_warnings = [
-  /`Rails.application.secrets` is deprecated in favor of `Rails.application.credentials`/,
   /Your `secret_key_base` is configured in `Rails.application.secrets`, which is deprecated in favor of/,
   /Please pass the (coder|class) as a keyword argument/
 ]