Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.vale.ini

@@ -8,8 +8,5 @@ MinAlertLevel = suggestion
 [*.md]
 BasedOnStyles = gitlab_base, gitlab_docs
 
-# Disable the front matter check until we migrate titles to Hugo format
-gitlab_docs.FrontMatter = NO
-
 # Ignore SVG markup
 TokenIgnores = (\*\*\{\w*\}\*\*)

app/assets/javascripts/rapid_diffs/options_menu/adapter.js

@@ -1,14 +1,20 @@
 import Vue from 'vue';
 import { GlDisclosureDropdown } from '@gitlab/ui';
 
+function getMenuItems(container) {
+  return JSON.parse(container.querySelector('script').textContent);
+}
+
 export const OptionsMenuAdapter = {
   clicks: {
     toggleOptionsMenu(event) {
       const button = event.target.closest('.js-options-button');
+      const menuContainer = button.parentElement;
+      const items = getMenuItems(menuContainer);
 
       if (!this.sink.optionsMenu) {
         this.sink.optionsMenu = new Vue({
-          el: Vue.version.startsWith('2') ? button : button.parentElement,
+          el: Vue.version.startsWith('2') ? button : menuContainer,
           name: 'GlDisclosureDropdown',
           render: (createElement = Vue.h) =>
             createElement(GlDisclosureDropdown, {
@@ -18,6 +24,7 @@ export const OptionsMenuAdapter = {
                 noCaret: true,
                 category: 'tertiary',
                 size: 'small',
+                items,
               },
             }),
         });

app/components/rapid_diffs/diff_file_header_component.html.haml

@@ -11,6 +11,10 @@
 -#  * toggle file comments
 -#  * submodule compare
 
+- view_title = _('View file @ %{commitSha}') % { commitSha: Commit.truncate_sha(@diff_file.content_sha) }
+- view_href = project_blob_path(@diff_file.repository.project, helpers.tree_join(@diff_file.content_sha, @diff_file.new_path))
+- options_menu_items = [ { "text": "#{view_title}", "href": "#{view_href}" } ].to_json
+
 .rd-diff-file-header{ data: { testid: 'rd-diff-file-header' } }
   .rd-diff-file-toggle<
     = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, icon: 'chevron-down', button_options: { class: 'rd-diff-file-toggle-button', data: { opened: '', click: 'toggleFile' }, aria: { label: _('Hide file contents') } })
@@ -51,4 +55,7 @@
         %span{ "data-testid" => "js-file-deletion-line" }= @diff_file.removed_lines
     .rd-diff-file-options-menu
       .js-options-menu
+        -# <script> here is likely the most effective way to minimize bytes: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182850#note_2387011092
+        %script{ type: "application/json" }
+          = options_menu_items.html_safe
         = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, icon: 'ellipsis_v', button_options: { class: 'js-options-button', data: { click: 'toggleOptionsMenu' }, aria: { label: _('Options') } })

app/models/issue.rb

@@ -817,6 +817,14 @@ def autoclose_by_merged_closing_merge_request?
     project.autoclose_referenced_issues
   end
 
+  def epic_work_item?
+    work_item_type&.epic?
+  end
+
+  def group_epic_work_item?
+    epic_work_item? && group_level?
+  end
+
   private
 
   def project_level_readable_by?(user)

app/policies/issue_policy.rb

@@ -13,6 +13,12 @@ def epics_license_available?
     false
   end
 
+  # Not available in FOSS.
+  # This method is Overridden in EE
+  def project_work_item_epics_available?
+    false
+  end
+
   # rubocop:disable Cop/UserAdmin -- specifically check the admin attribute
   desc "User can read confidential issues"
   condition(:can_read_confidential) do
@@ -47,17 +53,22 @@ def epics_license_available?
     end
   end
 
-  # group level issues license for now is equivalent to epics license. We'll have to migrate epics license to
-  # work items context once epics are fully migrated to work items.
-  condition(:group_level_issues_license_available) do
-    epics_license_available?
-  end
-
   # this is temporarily needed until we rollout implementation of move and clone for all work item types
   condition(:supports_move_and_clone, scope: :subject) do
     @subject.supports_move_and_clone?
   end
 
+  condition(:work_item_type_available, scope: :subject) do
+    if group_issue?
+      # For now all work item types at group-level require the epics licensed feature
+      epics_license_available?
+    elsif @subject.epic_work_item?
+      project_work_item_epics_available?
+    else
+      true
+    end
+  end
+
   rule { group_issue & can?(:read_group) }.policy do
     enable :create_note
   end
@@ -168,9 +179,9 @@ def epics_license_available?
     prevent :destroy_issue
   end
 
-  # IMPORTANT: keep the prevent rules as last rules defined in the policy, as these are based on
+  # IMPORTANT: keep the prevention rules as last rules defined in the policy, as these are based on
   # all abilities defined up to this point.
-  rule { group_issue & ~group_level_issues_license_available }.policy do
+  rule { ~work_item_type_available }.policy do
     prevent(*::IssuePolicy.ability_map.map.keys)
   end
 end

app/policies/work_item_policy.rb

@@ -41,13 +41,13 @@ class WorkItemPolicy < IssuePolicy
     prevent :delete_work_item
   end
 
+  rule { can_report_spam }.enable :report_spam
+
   # IMPORTANT: keep the prevent rules as last rules defined in the policy, as these are based on
   # all abilities defined up to this point.
-  rule { group_issue & ~group_level_issues_license_available }.policy do
+  rule { ~work_item_type_available }.policy do
     prevent(*::WorkItemPolicy.ability_map.map.keys)
   end
-
-  rule { can_report_spam }.enable :report_spam
 end
 
 WorkItemPolicy.prepend_mod

app/services/import/placeholder_memberships/create_service.rb

@@ -5,7 +5,10 @@ module PlaceholderMemberships
     class CreateService
       include Services::ReturnServiceResponses
 
-      def initialize(source_user:, access_level:, expires_at: nil, group: nil, project: nil)
+      def initialize(
+        source_user:, access_level:, expires_at: nil, group: nil, project: nil,
+        ignore_duplicate_errors: false)
+        @ignore_duplicate_errors = ignore_duplicate_errors
         @reference = Import::Placeholders::Membership.new(
           source_user: source_user,
           namespace_id: source_user.namespace_id,
@@ -19,12 +22,33 @@ def initialize(source_user:, access_level:, expires_at: nil, group: nil, project
       def execute
         return success(reference: reference) if reference.save
 
+        if ignore_duplicate_errors?(reference)
+          log_duplicate_membership
+          return success(reference: reference)
+        end
+
         error(reference.errors.full_messages, :bad_request)
       end
 
       private
 
-      attr_reader :reference
+      attr_reader :reference, :ignore_duplicate_errors
+
+      def ignore_duplicate_errors?(reference)
+        ignore_duplicate_errors && (reference.errors.of_kind?(:project_id, :taken) ||
+          reference.errors.of_kind?(:group_id, :taken))
+      end
+
+      def log_duplicate_membership
+        logger.info(
+          message: 'Project or group has already been taken. Skipping placeholder membership creation',
+          reference: reference
+        )
+      end
+
+      def logger
+        @logger ||= ::Import::Framework::Logger.build
+      end
     end
   end
 end

db/migrate/20240820135108_create_ai_code_suggestion_events.rb

@@ -6,7 +6,7 @@ class CreateAiCodeSuggestionEvents < Gitlab::Database::Migration[2.2]
 
   def up
     # rubocop:disable Migration/Datetime -- "timestamp" is a column name
-    create_table :ai_code_suggestion_events, # rubocop:disable Migration/EnsureFactoryForTable -- code_suggestion_event
+    create_table :ai_code_suggestion_events,
       options: 'PARTITION BY RANGE (timestamp)',
       primary_key: [:id, :timestamp] do |t|
       t.bigserial :id, null: false

doc/.vale/gitlab_docs/FrontMatter.yml

@@ -37,13 +37,18 @@ script: |
       hasError = true
     }
 
-    // First check if we have a title key at all
-    hasTitleKey := text.re_match("(?m)^[tT]itle:", frontmatter)
-    // Then check if it has content (anything but whitespace) after the colon
-    hasValidTitle := text.re_match("(?m)^[tT]itle:[^\\n]*[^\\s][^\\n]*$", frontmatter)
+    // Check if the page has redirect_to (these pages don't need titles)
+    hasRedirectTo := text.re_match("(?m)^redirect_to:", frontmatter)
 
-    if !hasError && (!hasTitleKey || !hasValidTitle) {
-      hasError = true
+    if !hasRedirectTo {
+      // First check if we have a title key at all
+      hasTitleKey := text.re_match("(?m)^[tT]itle:", frontmatter)
+      // Then check if it has content (anything but whitespace) after the colon
+      hasValidTitle := text.re_match("(?m)^[tT]itle:[^\\n]*[^\\s][^\\n]*$", frontmatter)
+
+      if !hasError && (!hasTitleKey || !hasValidTitle) {
+        hasError = true
+      }
     }
   }