Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/ci/mixins/pipeline_variables_permissions_mixin.js

@@ -7,7 +7,6 @@ import { createAlert } from '~/alert';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import PipelineInputsForm from '~/ci/common/pipeline_inputs/pipeline_inputs_form.vue';
-import PipelineVariablesPermissionsMixin from '~/ci/mixins/pipeline_variables_permissions_mixin';
 import createPipelineMutation from '../graphql/mutations/create_pipeline.mutation.graphql';
 import RefsDropdown from './refs_dropdown.vue';
 import PipelineVariablesForm from './pipeline_variables_form.vue';
@@ -38,9 +37,10 @@ export default {
       import('ee_component/vue_shared/components/pipeline_account_verification_alert.vue'),
   },
   directives: { SafeHtml },
-  mixins: [glFeatureFlagsMixin(), PipelineVariablesPermissionsMixin],
+  mixins: [glFeatureFlagsMixin()],
   inject: [
     'canViewPipelineEditor',
+    'canSetPipelineVariables',
     'pipelineEditorPath',
     'pipelinesPath',
     'projectPath',
@@ -266,7 +266,7 @@ export default {
         @update-inputs="handleInputsUpdated"
       />
       <pipeline-variables-form
-        v-if="canViewPipelineVariables"
+        v-if="canSetPipelineVariables"
         :file-params="fileParams"
         :is-maintainer="isMaintainer"
         :project-path="projectPath"

app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue

@@ -14,6 +14,7 @@ const mountPipelineNewForm = (el) => {
     projectPath,
     projectRefsEndpoint,
     userRole,
+    canSetPipelineVariables,
 
     // props
     defaultBranch,
@@ -39,6 +40,7 @@ const mountPipelineNewForm = (el) => {
     apolloProvider,
     provide: {
       canViewPipelineEditor: parseBoolean(canViewPipelineEditor),
+      canSetPipelineVariables: parseBoolean(canSetPipelineVariables),
       identityVerificationPath,
       // Normally this will have a value from a helper. In this case, this is
       // set to true because the alert that uses this field is dynamically

app/assets/javascripts/ci/pipeline_new/index.js

@@ -90,7 +90,8 @@ def new_pipeline_data(project)
         project_refs_endpoint: refs_project_path(project, sort: 'updated_desc'),
         settings_link: project_settings_ci_cd_path(project),
         max_warnings: ::Gitlab::Ci::Warnings::MAX_LIMIT,
-        user_role: project.team.human_max_access(current_user&.id)
+        user_role: project.team.human_max_access(current_user&.id),
+        can_set_pipeline_variables: Ability.allowed?(current_user, :set_pipeline_variables, project).to_s
       }
     end
 

app/helpers/ci/pipelines_helper.rb

@@ -17,7 +17,8 @@ class ResourceGroup < Ci::ApplicationRecord
     enum process_mode: {
       unordered: 0,
       oldest_first: 1,
-      newest_first: 2
+      newest_first: 2,
+      newest_ready_first: 3
     }
 
     ##
@@ -53,6 +54,9 @@ def upcoming_processables
       elsif newest_first?
         processables.waiting_for_resource_or_upcoming
           .order(Arel.sql("commit_id DESC, #{sort_by_job_status}"))
+      elsif newest_ready_first?
+        processables.waiting_for_resource
+          .order(Arel.sql("commit_id DESC, #{sort_by_job_status}"))
       else
         Ci::Processable.none
       end

app/models/ci/resource_group.rb

@@ -5,4 +5,4 @@ feature_category: service_desk
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/174506
 milestone: '17.7'
 queued_migration_version: 20241203075620
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250421231526'

db/docs/batched_background_migrations/backfill_issue_email_participants_namespace_id.yml

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillIssueEmailParticipantsNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '18.0'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillIssueEmailParticipantsNamespaceId',
+      table_name: :issue_email_participants,
+      column_name: :id,
+      job_arguments: [:namespace_id, :issues, :namespace_id, :issue_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end

db/post_migrate/20250421231526_finalize_hk_backfill_issue_email_participants_namespace_id.rb

@@ -0,0 +1 @@
+ea58f13a7a8e80d42684aeec2795ee912687951bd58580658a720255564f7c78

db/schema_migrations/20250421231526

@@ -136,6 +136,26 @@ To enable the GitLab for Slack app functionality, your network must allow inboun
 - For [Slack notifications](../../user/project/integrations/gitlab_slack_application.md#slack-notifications), the GitLab instance must be able to send requests to `https://slack.com`.
 - For [Slash commands](../../user/project/integrations/gitlab_slack_application.md#slash-commands) and other features, the GitLab instance must be able to receive requests from `https://slack.com`.
 
+## Enable support for multiple workspaces
+
+By default, you can [install the GitLab for Slack app](../../user/project/integrations/gitlab_slack_application.md#install-the-gitlab-for-slack-app) in only one Slack workspace.
+An administrator selects this workspace when they [create a GitLab for Slack app](#create-a-gitlab-for-slack-app).
+
+To enable support for multiple Slack workspaces, you must configure the GitLab for Slack app
+as an [unlisted distributed app](https://api.slack.com/distribution#unlisted-distributed-apps).
+An unlisted distributed app:
+
+- Is not published in the Slack App Directory.
+- Can only be used with your GitLab instance and not by other sites.
+
+To configure the GitLab for Slack app as an unlisted distributed app:
+
+1. Go to the [**Your Apps**](https://api.slack.com/apps) page on Slack and select your GitLab for Slack app.
+1. Select **Manage Distribution**.
+1. In the **Share Your App with Other Workspaces** section, expand **Remove Hard Coded Information**.
+1. Select the **I've reviewed and removed any hard-coded information** checkbox.
+1. Select **Activate Public Distribution**.
+
 ## Troubleshooting
 
 When administering the GitLab for Slack app, you might encounter the following issues.

doc/administration/settings/slack_app.md

@@ -49771,6 +49771,7 @@ definitions:
         - unordered
         - oldest_first
         - newest_first
+        - newest_ready_first
     description: Edit an existing resource group
   postApiV4ProjectsIdRunners:
     type: object