Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/qa-common/omnibus.gitlab-ci.yml

@@ -91,12 +91,14 @@ trigger-omnibus:
     USE_SPECIFIED_RUBY_VERSION: "true"
     RUBY_VERSION: $FULL_RUBY_VERSION
     BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS
-    SKIP_QA_TEST: "true"
+    SKIP_QA_TEST: "true" # Deprecated: It'll be removed once rolling out `inputs.skip_qa_test`.
     ee: $EE
   trigger:
     project: gitlab-org/build/omnibus-gitlab-mirror
     branch: $TRIGGER_BRANCH
     strategy: depend
+    inputs:
+      skip_qa_test: true
 
 trigger-omnibus as-if-foss:
   extends:

.gitlab/issue_templates/R&D Interlock Epic.md

@@ -0,0 +1,66 @@
+## Executive Summary
+[Brief description of the feature and its scope]
+
+#### Engineering Assessment 
+
+[Brief description of the engineering assessment of this candidate item.]
+
+#### Dependencies
+- Team dependencies: [List team dependencies]
+- Epic/Issue dependencies: [Link to dependent epics/issues]
+- External dependencies: [Any external dependencies]
+
+#### DRIs
+- **PM**: [Name] <!-- also add as assignee to this epic -->
+- **EM**: [Name] <!-- also add as assignee to this epic -->
+- **UX/PDM**: [Name] <!-- also add as assignee to this epic -->
+- **Group(s)**: [Group name(s)] <!-- also add as label -->
+- **Engineering Owner**: [Name]
+
+#### Business Impact
+- **Product motivation**: [Description]
+- **Key customers**: [List of key customers]
+- **ARR impact**: [Anticipated ARR impact]
+
+#### Sizing and Funding (Optional)
+- **Size**: [XS/S/M/L/XL]
+- **Funding Status**: [Funded/Partially funded/Not funded]
+
+---
+
+### Hygiene Guidelines
+
+_See additional details about this process at https://gitlab.com/groups/gitlab-org/-/wikis/R&D-Interlock-Process-Dashboard?#interlock-process_
+
+##### :one: Pre-Interlock
+- Update epic description with all relevant information
+- Ensure all dependencies are identified
+- Apply appropriate labels (see below)
+- Update interlock status as discussions progress (via label)
+
+##### :two: Post-Interlock
+- Update health status weekly (via label)
+- Document any newly identified risks or dependencies
+- Link to implementation epics/issues as work begins
+- Flag any scope or timeline changes immediately
+
+<!-- 
+Apply appropriate labels:
+- [ ] Section (section::dev, section::ops, section::sec)
+- [ ] Stage (devops::plan, devops::create, devops::verify, etc.)
+- [ ] Group (group::product planning, group::project management, etc.)
+- [ ] Priority (Product labels = Product Priority::P1, Product Priority::P2, Product Priority::P3, Engineering labels = Eng Priority::E1, Eng Priority::E2, Eng Priority::E3)
+- [ ] Tier (GTM tier::Tier 1, GTM tier::Tier 2, GTM tier::Tier 3)
+- [ ] Investment theme (Investment theme::Core-Devops, Investment theme::Security-Compliance, Investment theme::AI across SDLC)
+- [ ] Platforms (platform: GitLab.com, platform: dedicated, platform: self-managed)
+- [ ] Subscription tier (GitLab Ultimate, GitLab Premium, GitLab Free)
+- [ ] Quarter (FY26 Q1, FY26 Q2, FY26 Q3, FY26 Q4)
+- [ ] Pre-interlock status label (interlock status::New/Proposal in progress, interlock status::cancelled, etc)
+- [ ] Post-interlock status label (R&D roadmap status::Executing, R&D roadmap status::Completed) 
+- [ ] Post-interlock health (health::on track, health::needs attention, health::at risk)
+-->
+
+> [!warning] This is a confidential epic because it may contain customer information
+
+/label ~"Interlock candidate" 
+/confidential

app/assets/javascripts/merge_request_dashboard/components/config_dropdown.vue

@@ -62,6 +62,9 @@ export default {
     },
   },
   methods: {
+    dropdownShown() {
+      this.trackEvent('open_display_preferences_dropdown_on_merge_request_homepage');
+    },
     async toggleShowLabels() {
       const isShowingLabels = !this.isShowingLabels;
 
@@ -88,6 +91,10 @@ export default {
       this.savingPreferences = true;
 
       try {
+        this.trackEvent('toggle_list_type_on_merge_request_homepage', {
+          property: mergeRequestDashboardListType,
+        });
+
         await this.$apollo.mutate({
           mutation: updatePreferencesMutation,
           variables: {
@@ -129,6 +136,7 @@ export default {
     :loading="savingPreferences"
     :toggle-class="{ '!gl-px-3': savingPreferences }"
     @select="updateListType"
+    @shown="dropdownShown"
   >
     <template #list-item="{ item }">
       <div class="gl-font-bold">{{ item.text }}</div>

app/services/work_items/data_sync/handlers/copy_data_handler.rb

@@ -4,7 +4,8 @@ module WorkItems
   module DataSync
     module Handlers
       class CopyDataHandler
-        attr_reader :work_item, :target_namespace, :target_work_item_type, :current_user, :params, :create_params
+        attr_reader :work_item, :target_namespace, :target_work_item_type, :current_user, :params, :create_params,
+          :operation
 
         # rubocop:disable Layout/LineLength -- Keyword arguments are making the line a bit longer
         def initialize(work_item:, target_namespace:, target_work_item_type:, current_user: nil, params: {}, overwritten_params: {})
@@ -13,6 +14,7 @@ def initialize(work_item:, target_namespace:, target_work_item_type:, current_us
           @target_work_item_type = target_work_item_type
           @current_user = current_user
           @params = params
+          @operation = params.delete(:operation)
 
           @create_params = {
             id: nil,
@@ -47,15 +49,19 @@ def execute
           # create the new work item
           ::WorkItems::DataSync::BaseCreateService.new(
             original_work_item: work_item,
-            operation: params.delete(:operation),
+            operation: operation,
             container: target_namespace,
             current_user: current_user,
             params: create_params.merge(params)
-          ).execute(skip_system_notes: true)
+          ).execute(skip_system_notes: skip_system_notes?)
         end
 
         private
 
+        def skip_system_notes?
+          (operation == :clone && !!params[:clone_with_notes]) || operation == :move
+        end
+
         def relative_position
           return if work_item.namespace.root_ancestor.id != target_namespace.root_ancestor.id
 

app/views/admin/hooks/_form.html.haml

@@ -29,6 +29,8 @@
   %fieldset.form-group
     = form.gitlab_ui_checkbox_component :merge_requests_events, _('Merge request events'),
     help_text: _('URL is triggered when a merge request is created, updated, or merged')
+  = render_if_exists 'admin/hooks/member_approval_events', form: form
+
 .form-group
   = form.label :enable_ssl_verification, _('SSL verification'), class: 'label-bold checkbox'
   = form.gitlab_ui_checkbox_component :enable_ssl_verification, _('Enable SSL verification')

app/views/errors/access_denied.html.haml

@@ -5,10 +5,10 @@
   = image_tag('illustrations/error/error-403-lg.svg', alt: '403', lazy: false)
   %h1
     = s_("403|403: You do not have the permission to access this page")
-  - if message
-    %p
-      = message
+
   %p
+    - if message
+      = message
     = s_('403|Please contact your GitLab administrator to get permission.')
   .action-container.js-go-back{ hidden: true }
     = render Pajamas::ButtonComponent.new(variant: :confirm) do

app/views/errors/not_found.html.haml

@@ -5,7 +5,6 @@
     = s_('404|404: Page not found')
   %p
     = s_("404|Make sure the address is correct and the page has not moved.")
-  %p
     = s_('404|Please contact your GitLab administrator if you think this is a mistake.')
   .action-container
     = form_tag search_path, method: :get, class: 'form-inline-flex' do |f|

config/events/open_display_preferences_dropdown_on_merge_request_homepage.yml

@@ -0,0 +1,15 @@
+---
+description: Merge request homepage display preferences dropdown was opened
+internal_events: true
+action: open_display_preferences_dropdown_on_merge_request_homepage
+identifiers:
+- user
+product_group: code_review
+product_categories:
+- code_review_workflow
+milestone: '17.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186954
+tiers:
+- free
+- premium
+- ultimate

config/events/toggle_list_type_on_merge_request_homepage.yml

@@ -0,0 +1,18 @@
+---
+description: Merge request homepage list type was changed
+internal_events: true
+action: toggle_list_type_on_merge_request_homepage
+identifiers:
+- user
+additional_properties:
+  property:
+    description: "List type. Either 'role_based'  or 'action_based'"
+product_group: code_review
+product_categories:
+- code_review_workflow
+milestone: '17.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186954
+tiers:
+- free
+- premium
+- ultimate

config/feature_flags/wip/ci_inputs_for_pipelines.yml renamed to config/feature_flags/beta/ci_inputs_for_pipelines.yml

@@ -5,5 +5,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182125
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/520290
 milestone: '17.10'
 group: group::pipeline authoring
-type: wip
-default_enabled: false
+type: beta
+default_enabled: true