Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/behaviors/shortcuts/shortcuts_work_items.js

@@ -59,7 +59,8 @@ export default class ShortcutsWorkItem {
     setTimeout(() => {
       const shortcutSelector = `.${selector} .shortcut-sidebar-dropdown-toggle`;
       const editBtn =
-        document.querySelector(`.is-modal ${shortcutSelector}`) ||
+        document.querySelector(`.gl-drawer ${shortcutSelector}`) ||
+        document.querySelector(`.modal ${shortcutSelector}`) ||
         document.querySelector(shortcutSelector);
       editBtn?.click();
     }, DEBOUNCE_DROPDOWN_DELAY);
@@ -69,13 +70,23 @@ export default class ShortcutsWorkItem {
   static editDescription() {
     // Need to click the element as on issues, editing is inline
     // on merge request, editing is on a different page
-    document.querySelector('.shortcut-edit-wi-description')?.click();
+    const editDescriptionSelector = '.shortcut-edit-wi-description';
+    const editButton =
+      document.querySelector(`.gl-drawer ${editDescriptionSelector}`) ||
+      document.querySelector(`.modal ${editDescriptionSelector}`) ||
+      document.querySelector(editDescriptionSelector);
+
+    editButton?.click();
 
     return false;
   }
 
   async copyReference() {
-    const refButton = document.querySelector('.shortcut-copy-reference');
+    const refSelector = '.shortcut-copy-reference';
+    const refButton =
+      document.querySelector(`.gl-drawer ${refSelector}`) ||
+      document.querySelector(`.modal ${refSelector}`) ||
+      document.querySelector(refSelector);
     const copiedRef = refButton?.dataset.clipboardText;
 
     if (copiedRef) {
@@ -88,7 +99,9 @@ export default class ShortcutsWorkItem {
   static replyWithSelectedText() {
     const gfmSelector = '.js-vue-markdown-field .js-gfm-input';
     let replyField =
-      document.querySelector(`.modal ${gfmSelector}`) || document.querySelector(gfmSelector);
+      document.querySelector(`.gl-drawer ${gfmSelector}`) ||
+      document.querySelector(`.modal ${gfmSelector}`) ||
+      document.querySelector(gfmSelector);
 
     // Ensure that markdown input is still present in the DOM
     // otherwise fall back to main comment input field.

app/controllers/projects/merge_requests/application_controller.rb

@@ -85,6 +85,18 @@ def close_merge_request_if_no_source_project
 
     @merge_request.close
   end
+
+  # rubocop: disable CodeReuse/ActiveRecord
+  def commit
+    commit_id = params[:commit_id].presence
+    return unless commit_id
+
+    return unless @merge_request.all_commits.exists?(sha: commit_id) ||
+      @merge_request.recent_context_commits.map(&:id).include?(commit_id)
+
+    @commit ||= @project.commit(commit_id)
+  end
+  # rubocop: enable CodeReuse/ActiveRecord
 end
 
 Projects::MergeRequests::ApplicationController.prepend_mod_with('Projects::MergeRequests::ApplicationController')

app/controllers/projects/merge_requests/diffs_controller.rb

@@ -134,16 +134,6 @@ def define_diff_vars
     render_404 unless @compare
   end
 
-  # rubocop: disable CodeReuse/ActiveRecord
-  def commit
-    return unless commit_id = params[:commit_id].presence
-    return unless @merge_request.all_commits.exists?(sha: commit_id) ||
-      @merge_request.recent_context_commits.map(&:id).include?(commit_id)
-
-    @commit ||= @project.commit(commit_id)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
   # rubocop: disable CodeReuse/ActiveRecord
   #
   # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735

app/controllers/projects/merge_requests_controller.rb

@@ -477,6 +477,7 @@ def render_html_page
   end
 
   def get_diffs_count
+    return @commit.raw_diffs.size if commit
     return @merge_request.context_commits_diff.raw_diffs.size if show_only_context_commits?
     return @merge_request.merge_request_diffs.find_by_id(params[:diff_id])&.size if params[:diff_id]
     return @merge_request.merge_head_diff.size if @merge_request.diffable_merge_ref? && params[:start_sha].blank?

app/graphql/mutations/ci/pipeline/create.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Ci
+    module Pipeline
+      class Create < BaseMutation
+        graphql_name 'PipelineCreate'
+
+        include FindsProject
+
+        field :pipeline,
+          Types::Ci::PipelineType,
+          null: true,
+          description: 'Pipeline created after mutation.'
+
+        argument :project_path, GraphQL::Types::ID,
+          required: true,
+          description: 'Full path of the project that is triggering the pipeline.'
+
+        argument :ref, GraphQL::Types::String,
+          required: true,
+          description: 'Ref on which to run the pipeline.'
+
+        argument :variables, [Types::Ci::VariableInputType],
+          required: false,
+          description: 'Variables for the pipeline.'
+
+        authorize :create_pipeline
+
+        def resolve(project_path:, **params)
+          project = authorized_find!(project_path)
+
+          response = ::Ci::CreatePipelineService
+            .new(project, current_user, params)
+            .execute(:web, ignore_skip_ci: true, save_on_errors: false)
+
+          if response.success?
+            { pipeline: response.payload, errors: [] }
+          else
+            { pipeline: nil, errors: [response.message] }
+          end
+        end
+      end
+    end
+  end
+end

app/graphql/types/mutation_type.rb

@@ -176,6 +176,7 @@ class MutationType < BaseObject
     mount_mutation Mutations::Ci::JobTokenScope::RemoveProject
     mount_mutation Mutations::Ci::JobTokenScope::UpdateJobTokenPolicies, experiment: { milestone: '17.6' }
     mount_mutation Mutations::Ci::Pipeline::Cancel
+    mount_mutation Mutations::Ci::Pipeline::Create
     mount_mutation Mutations::Ci::Pipeline::Destroy
     mount_mutation Mutations::Ci::Pipeline::Retry
     mount_mutation Mutations::Ci::PipelineSchedule::Create

doc/api/graphql/reference/index.md

@@ -7940,6 +7940,27 @@ Input type: `PipelineCancelInput`
 | <a id="mutationpipelinecancelclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
 | <a id="mutationpipelinecancelerrors"></a>`errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. |
 
+### `Mutation.pipelineCreate`
+
+Input type: `PipelineCreateInput`
+
+#### Arguments
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="mutationpipelinecreateclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
+| <a id="mutationpipelinecreateprojectpath"></a>`projectPath` | [`ID!`](#id) | Full path of the project that is triggering the pipeline. |
+| <a id="mutationpipelinecreateref"></a>`ref` | [`String!`](#string) | Ref on which to run the pipeline. |
+| <a id="mutationpipelinecreatevariables"></a>`variables` | [`[CiVariableInput!]`](#civariableinput) | Variables for the pipeline. |
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="mutationpipelinecreateclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
+| <a id="mutationpipelinecreateerrors"></a>`errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. |
+| <a id="mutationpipelinecreatepipeline"></a>`pipeline` | [`Pipeline`](#pipeline) | Pipeline created after mutation. |
+
 ### `Mutation.pipelineDestroy`
 
 Input type: `PipelineDestroyInput`

doc/operations/logs.md

@@ -11,9 +11,13 @@ DETAILS:
 **Offering:** GitLab.com, Self-managed
 **Status:** Beta
 
+NOTE:
+This feature is not under active development.
+
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143027) in GitLab 16.10 [with a flag](../administration/feature_flags.md) named `observability_logs`. Disabled by default. This feature is in [beta](../policy/experiment-beta-support.md#beta).
 > - Feature flag [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158786) in GitLab 17.3 to the `observability_features` [feature flag](../administration/feature_flags.md), disabled by default. The previous feature flag (`observability_logs`) was removed.
 > - [Introduced](https://gitlab.com/groups/gitlab-org/opstrace/-/epics/100) for self-managed in GitLab 17.3.
+> - [Changed](https://gitlab.com/gitlab-com/marketing/digital-experience/buyer-experience/-/issues/4198) to internal Beta in GitLab 17.7.
 
 FLAG:
 The availability of this feature is controlled by a feature flag.

doc/operations/metrics.md

@@ -11,9 +11,13 @@ DETAILS:
 **Offering:** GitLab.com, Self-managed
 **Status:** Beta
 
+NOTE:
+This feature is not under active development.
+
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124966) in GitLab 16.7 [with a flag](../administration/feature_flags.md) named `observability_metrics`. Disabled by default. This feature is an [experiment](../policy/experiment-beta-support.md#experiment).
 > - Feature flag [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158786) in GitLab 17.3 to the `observability_features` [feature flag](../administration/feature_flags.md), disabled by default. The previous feature flag (`observability_metrics`) was removed.
 > - [Introduced](https://gitlab.com/groups/gitlab-org/opstrace/-/epics/100) for self-managed in GitLab 17.3.
+> - [Changed](https://gitlab.com/gitlab-com/marketing/digital-experience/buyer-experience/-/issues/4198) to internal beta in GitLab 17.7.
 
 FLAG:
 The availability of this feature is controlled by a feature flag.

doc/operations/tracing.md

@@ -11,9 +11,13 @@ DETAILS:
 **Offering:** GitLab.com, Self-managed
 **Status:** Beta
 
+NOTE:
+This feature is not under active development.
+
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124966) in GitLab 16.2 [with a flag](../administration/feature_flags.md) named `observability_tracing`. Disabled by default. This feature is in [beta](../policy/experiment-beta-support.md#beta).
 > - Feature flag [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158786) in GitLab 17.3 to the `observability_features` [feature flag](../administration/feature_flags.md), disabled by default. The previous feature flag `observability_tracing` was removed.
 > - [Introduced](https://gitlab.com/groups/gitlab-org/opstrace/-/epics/100) for self-managed in GitLab 17.3.
+> - [Changed](https://gitlab.com/gitlab-com/marketing/digital-experience/buyer-experience/-/issues/4198) to internal beta in GitLab 17.7.
 
 FLAG:
 The availability of this feature is controlled by a feature flag.

doc/subscriptions/gitlab_com/compute_minutes.md

@@ -12,7 +12,7 @@ DETAILS:
 
 [Compute minutes](../../ci/pipelines/compute_minutes.md) is the resource consumed
 when running [CI/CD pipelines](../../ci/index.md) on GitLab instance runners. You can find
-pricing for additional compute minutes on the [GitLab Pricing page](https://about.gitlab.com/pricing/).
+pricing for additional compute minutes on the [GitLab Pricing page](https://about.gitlab.com/pricing/#compute-minutes).
 
 Additional compute minutes:
 

spec/features/merge_request/user_views_diffs_commit_spec.rb

@@ -8,12 +8,28 @@
   end
 
   let(:project) { create(:project, :public, :repository) }
+  let(:commit_id) { merge_request.diff_head_sha }
 
   before do
-    visit(diffs_project_merge_request_path(project, merge_request, commit_id: merge_request.diff_head_sha))
+    visit(diffs_project_merge_request_path(project, merge_request, commit_id: commit_id))
   end
 
   it 'shows full commit description by default' do
-    expect(page).to have_selector('.commit-row-description', visible: true)
+    within_testid('commit-content') do
+      expect(page).to have_content("Add submodule from gitlab.com")
+    end
+  end
+
+  it 'shows correct commit metadata' do
+    expect(page).to have_content("Viewing commit #{commit_id[..7]}")
+    within_testid('diffs-tab') do
+      expect(page).to have_content('Changes 2')
+    end
+    page.within('#diffs') do
+      expect(page).to have_content('2 files')
+    end
+    within_testid('file-tree-container') do
+      expect(page).to have_content('Files 2')
+    end
   end
 end

spec/requests/api/graphql/mutations/ci/pipeline/cancel_spec.rb

@@ -36,7 +36,7 @@
     expect(build).not_to be_canceled
   end
 
-  context 'when running build' do
+  context 'when a build is running' do
     let!(:job) { create(:ci_build, :running, pipeline: pipeline) }
 
     context 'when supports canceling is true' do
@@ -52,7 +52,7 @@
     end
 
     context 'when supports canceling is false' do
-      it 'cancels all running jobs to canceled', :sidekiq_inline do
+      it 'updates all running jobs to `canceled`', :sidekiq_inline do
         post_graphql_mutation(mutation, current_user: user)
 
         expect(response).to have_gitlab_http_status(:success)

spec/requests/api/graphql/mutations/ci/pipeline/create_spec.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'PipelineCreate', feature_category: :pipeline_composition do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project, :public, :repository) }
+
+  let(:mutation) do
+    variables = {
+      project_path: project.full_path,
+      **params
+    }
+
+    graphql_mutation(
+      :pipeline_create,
+      variables,
+      <<-QL
+        errors
+        pipeline {
+          id
+        }
+      QL
+    )
+  end
+
+  let(:params) { { ref: 'master', variables: [] } }
+
+  let(:mutation_response) { graphql_mutation_response(:pipeline_create) }
+
+  it 'returns an error if the user is not allowed to create a pipeline' do
+    post_graphql_mutation(mutation, current_user: build(:user))
+
+    expect(graphql_errors.first['message']).to include("you don't have permission to perform this action")
+  end
+
+  context 'when the user is authorized' do
+    let_it_be(:user) { create(:user) }
+
+    before_all do
+      project.add_developer(user)
+    end
+
+    context 'when the pipeline creation is not successful' do
+      it 'returns error' do
+        expect_next_instance_of(::Ci::CreatePipelineService, project, user, params) do |service|
+          expect(service).to receive(:execute).and_return(ServiceResponse.error(message: 'Error'))
+        end
+
+        post_graphql_mutation(mutation, current_user: user)
+
+        expect(mutation_response['errors']).to include('Error')
+        expect(mutation_response['pipeline']).to be_nil
+      end
+    end
+
+    context 'when the pipeline creation is successful' do
+      it 'creates a pipeline' do
+        pipeline = create(:ci_pipeline, project: project)
+
+        expect_next_instance_of(::Ci::CreatePipelineService, project, user, params) do |service|
+          expect(service).to receive(:execute).and_return(ServiceResponse.success(payload: pipeline))
+        end
+
+        post_graphql_mutation(mutation, current_user: user)
+
+        expect(mutation_response['pipeline']['id']).to eq(pipeline.to_global_id.to_s)
+        expect(response).to have_gitlab_http_status(:success)
+      end
+    end
+  end
+end