Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/stylesheets/performance_bar.scss

@@ -83,7 +83,7 @@
     }
   }
 
-  .current-host.canary {
+  .canary {
     color: $perf-bar-canary-text;
   }
 
@@ -127,23 +127,6 @@
     }
   }
 
-  .css-truncate {
-    &.css-truncate-target,
-    .css-truncate-target {
-      display: inline-block;
-      max-width: 125px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      vertical-align: top;
-    }
-
-    &.expandable:hover .css-truncate-target,
-    &.expandable:hover.css-truncate-target {
-      max-width: 10000px !important;
-    }
-  }
-
   .performance-bar-modal {
     .modal-body {
       padding: 0;

app/mailers/emails/members.rb

@@ -35,21 +35,6 @@ def member_access_granted_email(member_source_type, member_id)
         subject: subject("Access to the #{member_source.human_name} #{member_source.model_name.singular} was granted"))
     end
 
-    def member_access_denied_email(member_source_type, source_id, user_id)
-      @member_source_type = member_source_type
-      @member_source = member_source_class.find(source_id)
-
-      user = User.find(user_id)
-
-      @source_hidden = !member_source.readable_by?(user)
-
-      human_name = @source_hidden ? 'Hidden' : member_source.human_name
-
-      email_with_layout(
-        to: user.notification_email_for(notification_group),
-        subject: subject("Access to the #{human_name} #{member_source.model_name.singular} was denied"))
-    end
-
     def member_invite_accepted_email(member_source_type, member_id)
       @member_source_type = member_source_type
       @member_id = member_id

app/mailers/members/access_denied_mailer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Members
+  class AccessDeniedMailer < ApplicationMailer
+    helper EmailsHelper
+
+    helper_method :member_source, :source_hidden?
+
+    layout 'mailer'
+
+    def email
+      return unless member.notifiable?(:subscription)
+
+      mail_with_locale(
+        to: user.notification_email_for(member_source.notification_group),
+        subject: EmailsHelper.subject_with_suffix([email_subject_text])
+      )
+    end
+
+    private
+
+    delegate :source, to: :member, prefix: true
+    delegate :user, to: :member
+
+    def source_hidden?
+      !member_source.readable_by?(user)
+    end
+
+    def member
+      params[:member]
+    end
+
+    def email_subject_text
+      human_name = source_hidden? ? 'Hidden' : member_source.human_name
+
+      "Access to the #{human_name} #{member_source.model_name.singular} was denied"
+    end
+  end
+end

app/mailers/previews/members/access_denied_mailer_preview.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Members
+  class AccessDeniedMailerPreview < ActionMailer::Preview
+    def public_source_email
+      Members::AccessDeniedMailer.with(member: public_member).email.message # rubocop:disable CodeReuse/ActiveRecord -- false positive
+    end
+
+    def private_source_email
+      Members::AccessDeniedMailer.with(member: private_member).email.message # rubocop:disable CodeReuse/ActiveRecord -- false positive
+    end
+
+    private
+
+    def public_member
+      # may need to create one if this doesn't find any
+      member(Group.public_only)
+    end
+
+    def private_member
+      # may need to create one if this doesn't find any
+      member(Group.private_only)
+    end
+
+    def member(scope)
+      scope.with_request_group_members.last.request_group_members.last
+    end
+  end
+end

app/mailers/previews/notify_preview.rb

@@ -160,10 +160,6 @@ def changed_milestone_merge_request_email
     Notify.changed_milestone_merge_request_email(user.id, merge_request.id, milestone, user.id)
   end
 
-  def member_access_denied_email
-    Notify.member_access_denied_email('project', project.id, user.id).message
-  end
-
   def member_access_granted_email
     Notify.member_access_granted_email(member.source_type, member.id).message
   end
@@ -469,7 +465,7 @@ def group
   end
 
   def member
-    @member ||= Member.non_invite.last
+    @member ||= Member.non_invite.non_request.last
   end
 
   def key

app/models/group.rb

@@ -40,6 +40,10 @@ def self.supported_keyset_orderings
   has_many :all_owner_members, -> { non_request.all_owners }, as: :source, class_name: 'GroupMember'
   has_many :group_members, -> { non_request.non_minimal_access }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent
   has_many :non_invite_group_members, -> { non_request.non_minimal_access.non_invite }, class_name: 'GroupMember', as: :source
+  has_many :request_group_members, -> do
+    request.non_minimal_access
+  end, inverse_of: :group, class_name: 'GroupMember', as: :source
+
   has_many :namespace_members, -> { non_request.non_minimal_access.unscope(where: %i[source_id source_type]) },
     foreign_key: :member_namespace_id, inverse_of: :group, class_name: 'GroupMember'
   alias_method :members, :group_members
@@ -184,6 +188,7 @@ def of_ancestors_and_self
   scope :with_non_archived_projects, -> { includes(:non_archived_projects) }
 
   scope :with_non_invite_group_members, -> { includes(:non_invite_group_members) }
+  scope :with_request_group_members, -> { includes(:request_group_members) }
 
   scope :by_id, ->(groups) { where(id: groups) }
 
@@ -1007,6 +1012,10 @@ def readme_project
   end
   strong_memoize_attr :readme_project
 
+  def notification_group
+    self
+  end
+
   def group_readme
     readme_project&.repository&.readme
   end

app/models/project.rb

@@ -189,6 +189,7 @@ class Project < ApplicationRecord
   belongs_to :creator, class_name: 'User'
   belongs_to :organization, class_name: 'Organizations::Organization'
   belongs_to :group, -> { where(type: Group.sti_name) }, foreign_key: 'namespace_id'
+  alias_method :notification_group, :group
   belongs_to :namespace
   # Sync deletion via DB Trigger to ensure we do not have
   # a project without a project_namespace (or vice-versa)

app/services/members/destroy_service.rb

@@ -91,7 +91,7 @@ def a_group_owner?(member)
 
     def delete_member_associations(member, skip_subresources, skip_saml_identity)
       if member.request? && member.user != current_user
-        notification_service.decline_access_request(member)
+        Members::AccessDeniedMailer.with(member: member).email.deliver_later # rubocop:disable CodeReuse/ActiveRecord -- false positive
       end
 
       delete_subresources(member) unless skip_subresources

app/services/notification_service.rb

@@ -512,12 +512,6 @@ def new_access_request(member)
     recipients.each { |recipient| deliver_access_request_email(recipient, member) }
   end
 
-  def decline_access_request(member)
-    return true unless member.notifiable?(:subscription)
-
-    mailer.member_access_denied_email(member.real_source_type, member.source_id, member.user_id).deliver_later
-  end
-
   def decline_invite(member)
     # Must always send, regardless of project/namespace configuration since it's a
     # response to the user's action.

app/views/notify/member_access_denied_email.html.haml renamed to app/views/members/access_denied_mailer/email.html.haml

@@ -1,7 +1,7 @@
 %tr
   %td.text-content
     %p
-      - target_to_join = @source_hidden ? content_tag(:span, _('Hidden'), class: :highlight) : link_to(member_source.human_name, member_source.web_url, class: :highlight)
+      - target_to_join = source_hidden? ? content_tag(:span, _('Hidden'), class: :highlight) : link_to(member_source.human_name, member_source.web_url, class: :highlight)
       - denied_tag = content_tag :span, _('denied'), class: :highlight
       = s_('Notify|Your request to join the %{target_to_join} %{target_type} has been %{denied_tag}.').html_safe % { target_to_join: target_to_join, target_type: member_source.model_name.singular, denied_tag: denied_tag }
 

app/views/members/access_denied_mailer/email.text.erb

@@ -0,0 +1,3 @@
+Your request to join the <%= source_hidden? ? 'Hidden' : member_source.human_name %> <%= member_source.model_name.singular %> has been denied.
+
+<%= member_source.web_url unless source_hidden? %>

app/views/notify/member_access_denied_email.text.erb

@@ -747,6 +747,8 @@
   - 1
 - - search_zoekt_index_marked_as_to_delete_event
   - 1
+- - search_zoekt_index_over_watermark_event
+  - 1
 - - search_zoekt_indexing_task
   - 1
 - - search_zoekt_initial_indexing_event

config/sidekiq_queues.yml

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddWatermarkLevelIndexToZoektIndices < Gitlab::Database::Migration[2.2]
+  INDEX_NAME = 'index_zoekt_indices_on_watermark_level_reserved_storage_bytes'
+
+  milestone '17.5'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :zoekt_indices,
+      [:watermark_level, :id],
+      where: "reserved_storage_bytes > 0",
+      name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name(:zoekt_indices, INDEX_NAME)
+  end
+end

db/migrate/20241001142307_add_watermark_level_index_to_zoekt_indices.rb

@@ -0,0 +1 @@
+502579d75df644c4472a046abd744ed287410624e4fc47cfe764e9a753462c95

db/schema_migrations/20241001142307

@@ -31487,6 +31487,8 @@ CREATE INDEX index_zoekt_indices_on_replica_id ON zoekt_indices USING btree (zoe
 
 CREATE UNIQUE INDEX index_zoekt_indices_on_state_and_id ON zoekt_indices USING btree (state, id);
 
+CREATE INDEX index_zoekt_indices_on_watermark_level_reserved_storage_bytes ON zoekt_indices USING btree (watermark_level, id) WHERE (reserved_storage_bytes > 0);
+
 CREATE UNIQUE INDEX index_zoekt_indices_on_zoekt_node_id_and_id ON zoekt_indices USING btree (zoekt_node_id, id);
 
 CREATE INDEX index_zoekt_nodes_on_last_seen_at ON zoekt_nodes USING btree (last_seen_at);

db/structure.sql

@@ -253,8 +253,8 @@ curl --request POST \
   --data '{
     "bitbucket_username": "bitbucket_username",
     "bitbucket_app_password": "bitbucket_app_password",
-    "repo_path": "username/my_project"
-    "target_namespace": "my_group/my_subgroup"
+    "repo_path": "username/my_project",
+    "target_namespace": "my_group/my_subgroup",
     "new_name": "new_project_name"
 }'
 ```