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

doc/api/openapi/openapi_v2.yaml

@@ -178,7 +178,7 @@ PUT /projects/:id/resource_groups/:key
 | --------------- | ------- | --------------------------------- | -------------------------------  |
 | `id`            | integer/string | yes                        | The ID or [URL-encoded path of the project](rest/_index.md#namespaced-paths)            |
 | `key`           | string  | yes                               |The URL-encoded key of the resource group. For example, use `resource%5Fa` instead of `resource_a`. |
-| `process_mode`  | string  | no                                | The process mode of the resource group. One of `unordered`, `oldest_first` or `newest_first`. Read [process modes](../ci/resource_groups/_index.md#process-modes) for more information. |
+| `process_mode`  | string  | no                                | The process mode of the resource group. One of `unordered`, `oldest_first`, `newest_first`, or `newest_ready_first`. Read [process modes](../ci/resource_groups/_index.md#process-modes) for more information. |
 
 ```shell
 curl --request PUT --data "process_mode=oldest_first" \

doc/api/resource_groups.md

@@ -90,6 +90,15 @@ The following modes are supported:
   prevent all of the old deploy jobs with the [prevent outdated deployment jobs](../environments/deployment_safety.md#prevent-outdated-deployment-jobs) feature.
   This is the most efficient option in terms of the pipeline efficiency, but you must ensure that each deployment job is idempotent.
 
+- **Newest ready first:** This process mode limits concurrency on jobs, but less than plain newest_first.
+  When a resource is free, it picks the first job from the list of upcoming jobs that are waiting on this resource.
+  This list of jobs is sorted by pipeline ID in descending order like above.
+
+  This mode is best for those who might want to continuously deploy, but deploy merge often enough that
+  newest_first can lead to situations when no deploys between merges. It can be faster than newest_first, but
+  carries with it a risk that a job that might be skipped in newest_first would be run, so ensuring
+  deploys are idempotent is of even greater importance.
+
 ### Change the process mode
 
 To change the process mode of a resource group, you must use the API and
@@ -99,6 +108,7 @@ by specifying the `process_mode`:
 - `unordered`
 - `oldest_first`
 - `newest_first`
+- `newest_ready_first`
 
 ### An example of difference between the process modes
 

doc/ci/resource_groups/_index.md

@@ -206,6 +206,30 @@ adding new tools can expand the capabilities of the Chat feature.
 
 There are available short [videos](https://www.youtube.com/playlist?list=PL05JrBw4t0KoOK-bm_bwfHaOv-1cveh8i) covering this topic.
 
+### Working with multi-thread conversation
+
+If you're building features that interact with Duo Chat conversations, you need to understand how threads work.
+
+Duo Chat supports multiple conversations. Each conversation is represented by a thread, which contains multiple messages. The important attributes of a thread are:
+
+- `id`: The `id` is required when replying to a thread.
+- `conversation_type`: This allows for distinguishing between the different available Duo Chat conversation types. See the [thread conversation types list](../../api/graphql/reference/_index.md#aiconversationsthreadsconversationtype).
+  - If your feature needs its own conversation type, please contact the Duo Chat team.
+
+If your feature requires calling GraphQL API directly, the following queries and mutations are available, for which you **must** specify the `conversation_type`.
+
+- [Query.aiConversationThreads](../../api/graphql/reference/_index.md#queryaiconversationthreads): lists threads
+- [Query.aiMessages](../../api/graphql/reference/_index.md#queryaimessages): lists one thread's messages. **Must** specify `threadId`.
+- [Mutation.aiAction](../../api/graphql/reference/_index.md#mutationaiaction): creates one message. If `threadId` is specified the message is appended into that thread.
+
+All chat conversations have a retention period, controlled by the admin. The default retention period is 30 days after last reply.
+
+- [Configure Duo Chat Conversation Expiration](../../user/gitlab_duo_chat/_index.md#configure-chat-conversation-expiration)
+
+### Developer Resources
+
+- [Example GraphQL Queries](#duo-chat-conversation-threads-graphql-queries) - See examples below in this document
+
 ## Debugging
 
 To gather more insights about the full request, use the `Gitlab::Llm::Logger` file to debug logs.
@@ -432,6 +456,68 @@ If you can't fetch the response, check `graphql_json.log`,
 `sidekiq_json.log`, `llm.log` or `modelgateway_debug.log` if it contains error
 information.
 
+### Duo Chat Conversation Threads GraphQL queries
+
+#### Querying messages in a conversation thread
+
+To retrieve messages from a specific thread, use the `aiMessages` query with a thread ID:
+
+```graphql
+query {
+  aiMessages(threadId: "gid://gitlab/Ai::Conversation::Thread/1") {
+    nodes {
+      requestId
+      content
+      role
+      timestamp
+      chunkId
+      errors
+    }
+  }
+}
+```
+
+#### Starting a new conversation thread
+
+If you don't include a threadId in your aiAction mutation, a new thread will be created:
+
+```graphql
+mutation {
+  aiAction(input: {
+    chat: {
+      content: "This will create a new conversation thread"
+    },
+    conversationType: DUO_CHAT
+  })
+  {
+    requestId
+    errors
+    threadId  # This will contain the ID of the newly created thread
+  }
+}
+```
+
+#### Creating a new message in an existing conversation thread
+
+To add a message to an existing thread, include the threadId in your aiAction mutation:
+
+```graphql
+mutation {
+  aiAction(input: {
+    chat: {
+      content: "this is another message in the same thread"
+    },
+    conversationType: DUO_CHAT,
+    threadId: "gid://gitlab/Ai::Conversation::Thread/1",
+  })
+  {
+    requestId
+    errors
+    threadId
+  }
+}
+```
+
 ## Testing GitLab Duo Chat in production-like environments
 
 GitLab Duo Chat is enabled in the [Staging](https://staging.gitlab.com/users/sign_in) and

doc/development/ai_features/duo_chat.md

@@ -25,6 +25,8 @@ title: Zoekt
 
 This feature is in [beta](../../policy/development_stages_support.md#beta) and subject to change without notice.
 For more information, see [epic 9404](https://gitlab.com/groups/gitlab-org/-/epics/9404).
+To provide feedback on this feature, leave a comment on
+[issue 420920](https://gitlab.com/gitlab-org/gitlab/-/issues/420920).
 
 {{< /alert >}}
 

doc/integration/exact_code_search/zoekt.md

@@ -341,3 +341,24 @@ A `403 Forbidden` is returned if the user information cannot be fetched from Jir
 
 To resolve this issue, ensure you meet certain
 [Jira user requirements](../../administration/settings/jira_cloud_app.md#jira-user-requirements).
+
+### Jira Code does not work after linking to a GitLab group
+
+[Jira Code](https://support.atlassian.com/jira-software-cloud/docs/enable-code/) might not work after you
+[link the GitLab for Jira Cloud app to a GitLab group](#configure-the-gitlab-for-jira-cloud-app).
+To resolve this issue, you must configure both Bitbucket and Jira.
+
+In Bitbucket:
+
+1. Sign in to your Atlassian account.
+1. Create and enter a name for your workspace.
+
+In Jira:
+
+1. In **Projects**, select your project.
+1. Select **Development > Code**.
+1. Select **Connect Bitbucket > Link Bitbucket Cloud workspace**.
+1. Select the workspace you created in Bitbucket.
+1. Select **Grant access**.
+
+Your repositories should now appear in Jira Code.

doc/integration/jira/connect-app.md

@@ -14,7 +14,7 @@ title: Compliance status report
 
 {{< history >}}
 
-- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186525) in GitLab 17.11 [with a flag](../../../administration/feature_flags.md) named `enable_standards_adherence_dashboard_v2`. Disabled by default.
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186525) in GitLab 17.11 [with a flag](../../../administration/feature_flags.md) named `enable_standards_adherence_dashboard_v2`. Enabled by default.
 
 {{< /history >}}