Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/graphql/resolvers/work_items/widgets/custom_status_resolver.rb

@@ -7,10 +7,11 @@ class CustomStatusResolver < BaseResolver
         type ::Types::WorkItems::Widgets::CustomStatusType.connection_type, null: true
 
         def resolve
-          # Implement during https://gitlab.com/gitlab-org/gitlab/-/issues/498393
-          [::WorkItems::Widgets::CustomStatus.new(nil), ::WorkItems::Widgets::CustomStatus.new(nil)]
+          []
         end
       end
     end
   end
 end
+
+Resolvers::WorkItems::Widgets::CustomStatusResolver.prepend_mod

app/graphql/types/work_items/widgets/custom_status_type.rb

@@ -12,22 +12,30 @@ class CustomStatusType < BaseObject
 
         implements ::Types::WorkItems::WidgetInterface
 
-        # TODO change the ID to CustomStatus model ID while implementing
-        # https://gitlab.com/gitlab-org/gitlab/-/issues/498393
-        field :id, ::Types::GlobalIDType[::WorkItems::Widgets::CustomStatus],
-          null: false,
+        field :id, Types::GlobalIDType,
+          null: true,
           experiment: { milestone: '17.8' },
-          description: 'ID of the Custom Status.'
+          description: 'ID of the custom status.'
 
         field :name, GraphQL::Types::String,
           null: true,
           experiment: { milestone: '17.8' },
-          description: 'Name of the Custom Status.'
+          description: 'Name of the custom status.'
 
         field :icon_name, GraphQL::Types::String,
           null: true,
           experiment: { milestone: '17.8' },
-          description: 'Icon name of the Custom Status.'
+          description: 'Icon name of the custom status.'
+
+        field :color, GraphQL::Types::String,
+          null: true,
+          experiment: { milestone: '17.10' },
+          description: 'Color of the custom status.'
+
+        field :position, GraphQL::Types::Int,
+          null: true,
+          experiment: { milestone: '17.10' },
+          description: 'Position of the custom status within its category.'
       end
       # rubocop:enable Graphql/AuthorizeTypes
     end

app/models/group.rb

@@ -1004,6 +1004,11 @@ def work_items_alpha_feature_flag_enabled?
     feature_flag_enabled_for_self_or_ancestor?(:work_items_alpha)
   end
 
+  def work_item_status_feature_available?
+    feature_flag_enabled_for_self_or_ancestor?(:work_item_status, type: :wip) &&
+      licensed_feature_available?(:work_item_custom_status)
+  end
+
   def continue_indented_text_feature_flag_enabled?
     feature_flag_enabled_for_self_or_ancestor?(:continue_indented_text, type: :wip)
   end

app/models/project.rb

@@ -3313,6 +3313,11 @@ def work_items_alpha_feature_flag_enabled?
     group&.work_items_alpha_feature_flag_enabled? || Feature.enabled?(:work_items_alpha)
   end
 
+  def work_item_status_feature_available?
+    (group&.work_item_status_feature_available? || Feature.enabled?(:work_item_status, type: :wip)) &&
+      licensed_feature_available?(:work_item_custom_status)
+  end
+
   def glql_integration_feature_flag_enabled?
     group&.glql_integration_feature_flag_enabled? || Feature.enabled?(:glql_integration, self)
   end

config/feature_flags/wip/work_item_status.yml

@@ -0,0 +1,9 @@
+---
+name: work_item_status
+feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/5099
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182225
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/521286
+milestone: '17.10'
+group: group::project management
+type: wip
+default_enabled: false

doc/administration/external_users.md

@@ -8,7 +8,7 @@ title: External users
 {{< details >}}
 
 - Tier: Free, Premium, Ultimate
-- Offering: GitLab Self-Managed
+- Offering: GitLab Self-Managed, GitLab Dedicated
 
 {{< /details >}}
 

doc/administration/packages/container_registry_metadata_database.md

@@ -32,7 +32,7 @@ By using a database to store this data, many new features are possible, includin
 which removes old data automatically with zero downtime.
 
 This database works in conjunction with the object storage already used by the registry, but does not replace object storage.
-You must continue to maintain an object storage solution even after migrating to a metadata database.
+You must continue to maintain an object storage solution even after migrating to the metadata database.
 
 For Helm Charts installations, see [Manage the container registry metadata database](https://docs.gitlab.com/charts/charts/registry/metadata_database.html#create-the-database)
 in the Helm Charts documentation.
@@ -103,7 +103,7 @@ To enable the database:
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
-1. [Apply schema migrations](#apply-schema-migrations).
+1. [Apply database migrations](#apply-database-migrations).
 1. Enable the database by editing `/etc/gitlab/gitlab.rb` and setting `enabled` to `true`:
 
    ```ruby
@@ -195,7 +195,7 @@ and your registry contains a relatively small amount of data.
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
-1. [Apply schema migrations](#apply-schema-migrations) if you have not done so.
+1. [Apply database migrations](#apply-database-migrations) if you have not done so.
 1. Run the following command:
 
    ```shell
@@ -283,7 +283,7 @@ If you must halt the operation, you have to restart this step.
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#reconfigure-a-linux-package-installation).
-1. [Apply schema migrations](#apply-schema-migrations) if you have not done so.
+1. [Apply database migrations](#apply-database-migrations) if you have not done so.
 1. Run the first step to begin the migration:
 
    ```shell
@@ -389,43 +389,50 @@ delay ensures that online garbage collection does not interfere with image pushe
 Check out the [monitor online garbage collection](#online-garbage-collection-monitoring) section
 to see how to monitor the progress and health of the online garbage collector.
 
-## Manage schema migrations
+## Database migrations
 
-Use the following commands to run the schema migrations for the Container registry metadata database.
-The registry must be enabled and the configuration section must have the database section filled.
+The container registry supports two types of migrations:
 
-### Apply schema migrations
+- **Regular schema migrations**: Changes to the database structure that must run before deploying new application code. These should be fast (no more than a few minutes) to avoid deployment delays.
+      
+- **Post-deployment migrations**: Changes to the database structure that can run while the application is running. Used for longer operations like creating indexes on large tables, avoiding startup delays and extended upgrade downtimes.
 
-1. Run the registry database schema migrations
+By default, the registry applies both regular schema and post-deployment migrations simultaneously. To reduce downtime during upgrades, you can skip post-deployment migrations and apply them manually after the application starts.
+
+### Apply database migrations
+
+To apply both regular schema and post-deployment migrations before the application starts:
+
+1. Run database migrations:
 
    ```shell
    sudo gitlab-ctl registry-database migrate up
    ```
 
-1. The registry must stop if it's running. Type `y` to confirm and wait for the process to finish.
-
-{{< alert type="note" >}}
+To skip post-deployment migrations:
 
-The `migrate up` command offers some extra flags that can be used to control how the migrations are applied.
-Run `sudo gitlab-ctl registry-database migrate up --help` for details.
+1. Run regular schema migrations only:
 
-{{< /alert >}}
+   ```shell
+   sudo gitlab-ctl registry-database migrate up --skip-post-deployment
+   ```
 
-### Undo schema migrations
+   As an alternative to the `--skip-post-deployment` flag, you can also set the `SKIP_POST_DEPLOYMENT_MIGRATIONS` environment variable to `true`:
 
-You can undo schema migrations in case anything goes wrong, but this is a non-recoverable action.
-If you pushed new images while the database was in use, they will no longer be accessible
-after this.
+   ```shell
+   SKIP_POST_DEPLOYMENT_MIGRATIONS=true sudo gitlab-ctl registry-database migrate up
+   ```
 
-1. Undo the registry database schema migrations:
+1. After starting the application, apply any pending post-deployment migrations:
 
    ```shell
-   sudo gitlab-ctl registry-database migrate down
+   sudo gitlab-ctl registry-database migrate up
    ```
 
 {{< alert type="note" >}}
 
-The `migrate down` command offers some extra flags. Run `sudo gitlab-ctl registry-database migrate down --help` for details.
+The `migrate up` command offers some extra flags that can be used to control how the migrations are applied.
+Run `sudo gitlab-ctl registry-database migrate up --help` for details.
 
 {{< /alert >}}
 
@@ -597,7 +604,7 @@ the registry fails to start with the following error message:
 FATA[0000] configuring application: there are pending database migrations, use the 'registry database migrate' CLI command to check and apply them
 ```
 
-To fix this issue, follow the steps to [apply schema migrations](#apply-schema-migrations).
+To fix this issue, follow the steps to [apply database migrations](#apply-database-migrations).
 
 ### Error: `offline garbage collection is no longer possible`
 
@@ -617,7 +624,7 @@ You must either:
 
 ### Error: `cannot execute <STATEMENT> in a read-only transaction`
 
-The registry could fail to [apply schema migrations](#apply-schema-migrations)
+The registry could fail to [apply database migrations](#apply-database-migrations)
 with the following error message:
 
 ```shell
@@ -658,7 +665,7 @@ If either of these values is set to `on`, you must disable it:
    ```
 
 1. Restart your Postgres server to apply these settings.
-1. Try to [apply schema migrations](#apply-schema-migrations) again, if applicable.
+1. Try to [apply database migrations](#apply-database-migrations) again, if applicable.
 1. Restart the registry `sudo gitlab-ctl restart registry`.
 
 ### Error: `cannot import all repositories while the tags table has entries`

doc/api/graphql/reference/_index.md

@@ -39901,9 +39901,11 @@ Represents Custom Status widget.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| <a id="workitemwidgetcustomstatusiconname"></a>`iconName` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.8. **Status**: Experiment. Icon name of the Custom Status. |
-| <a id="workitemwidgetcustomstatusid"></a>`id` {{< icon name="warning-solid" >}} | [`WorkItemsWidgetsCustomStatusID!`](#workitemswidgetscustomstatusid) | **Introduced** in GitLab 17.8. **Status**: Experiment. ID of the Custom Status. |
-| <a id="workitemwidgetcustomstatusname"></a>`name` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.8. **Status**: Experiment. Name of the Custom Status. |
+| <a id="workitemwidgetcustomstatuscolor"></a>`color` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.10. **Status**: Experiment. Color of the custom status. |
+| <a id="workitemwidgetcustomstatusiconname"></a>`iconName` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.8. **Status**: Experiment. Icon name of the custom status. |
+| <a id="workitemwidgetcustomstatusid"></a>`id` {{< icon name="warning-solid" >}} | [`GlobalID`](#globalid) | **Introduced** in GitLab 17.8. **Status**: Experiment. ID of the custom status. |
+| <a id="workitemwidgetcustomstatusname"></a>`name` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.8. **Status**: Experiment. Name of the custom status. |
+| <a id="workitemwidgetcustomstatusposition"></a>`position` {{< icon name="warning-solid" >}} | [`Int`](#int) | **Introduced** in GitLab 17.10. **Status**: Experiment. Position of the custom status within its category. |
 | <a id="workitemwidgetcustomstatustype"></a>`type` | [`WorkItemWidgetType`](#workitemwidgettype) | Widget type. |
 
 ### `WorkItemWidgetDefinitionAssignees`
@@ -45393,12 +45395,6 @@ A `WorkItemsTypeID` is a global ID. It is encoded as a string.
 
 An example `WorkItemsTypeID` is: `"gid://gitlab/WorkItems::Type/1"`.
 
-### `WorkItemsWidgetsCustomStatusID`
-
-A `WorkItemsWidgetsCustomStatusID` is a global ID. It is encoded as a string.
-
-An example `WorkItemsWidgetsCustomStatusID` is: `"gid://gitlab/WorkItems::Widgets::CustomStatus/1"`.
-
 ## Abstract types
 
 Abstract types (unions and interfaces) are ways the schema can represent

doc/user/application_security/dast/browser/configuration/requirements.md

@@ -19,6 +19,14 @@ title: Requirements
     - dast
   ```
 
+- A network connection between the runner and your target application.
+
+  How you connect depends on your DAST configuration:
+  - If `DAST_TARGET_URL` and `DAST_AUTH_URL` specify port numbers, use those ports.
+  - If ports are not specified, use the standard port numbers for HTTP and HTTPS.
+
+  You might need to open both an HTTP and HTTPS port. For example, if the target URL uses HTTP, but the application links to resources using HTTPS. Always test your connection when you configure a scan.
+
 ## Recommendations
 
 - Take care if your pipeline is configured to deploy to the same web server in each run. Running a DAST scan while a server is being updated leads to inaccurate and non-deterministic results.

doc/user/application_security/vulnerabilities/_index.md

@@ -2,7 +2,7 @@
 stage: Security Risk Management
 group: Security Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-title: Vulnerability Page
+title: Vulnerability details
 ---
 
 {{< details >}}

spec/graphql/resolvers/work_items/widgets/custom_status_resolver_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Resolvers::WorkItems::Widgets::CustomStatusResolver, feature_category: :team_planning do
+  include GraphqlHelpers
+
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:task_type) { create(:work_item_type, :task) }
+  let_it_be(:widget_definition) do
+    create(:widget_definition, widget_type: :custom_status, work_item_type: task_type, name: 'TesT Widget')
+  end
+
+  shared_examples 'does not return system defined statuses' do
+    it 'returns an empty array' do
+      expect(resolve_custom_statuses&.items).to eq([])
+    end
+  end
+
+  describe '#resolve' do
+    let(:resource_parent) { group }
+
+    context 'with group' do
+      it_behaves_like 'does not return system defined statuses'
+    end
+
+    context 'with project' do
+      let(:resource_parent) { project }
+
+      it_behaves_like 'does not return system defined statuses'
+    end
+
+    context 'with unsupported namespace' do
+      let(:resource_parent) { current_user.namespace }
+
+      it_behaves_like 'does not return system defined statuses'
+    end
+
+    context 'with work_item_status feature flag disabled' do
+      before do
+        stub_feature_flags(work_item_status: false)
+      end
+
+      it_behaves_like 'does not return system defined statuses'
+    end
+  end
+
+  def resolve_custom_statuses(args = {}, context = { current_user: current_user, resource_parent: resource_parent })
+    resolve(described_class, obj: widget_definition, args: args, ctx: context)
+  end
+end

spec/graphql/types/work_items/widgets/custom_status_type_spec.rb

@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::WorkItems::Widgets::CustomStatusType, feature_category: :service_desk do
+RSpec.describe Types::WorkItems::Widgets::CustomStatusType, feature_category: :team_planning do
   it 'exposes the expected fields' do
-    expected_fields = %i[id name icon_name]
+    expected_fields = %i[id name icon_name color position]
 
     expected_fields.each do |field|
       expect(described_class).to have_graphql_field(field)

spec/models/group_spec.rb

@@ -4063,6 +4063,12 @@ def define_cache_expectations(cache_key)
     end
   end
 
+  describe '#work_item_status_feature_available?' do
+    subject { group.work_item_status_feature_available? }
+
+    it { is_expected.to be false }
+  end
+
   describe '#continue_indented_text_feature_flag_enabled?' do
     it_behaves_like 'checks self and root ancestor feature flag' do
       let(:feature_flag) { :continue_indented_text }

spec/models/project_spec.rb

@@ -5767,9 +5767,9 @@ def has_external_wiki
   end
 
   describe '#predefined_project_variables' do
-    let_it_be(:project) { create(:project, :repository) }
+    let(:project_with_pre_defined_var) { create(:project, :repository) }
 
-    subject { project.predefined_project_variables.to_runner_variables }
+    subject { project_with_pre_defined_var.predefined_project_variables.to_runner_variables }
 
     specify do
       expect(subject).to include(
@@ -5779,7 +5779,7 @@ def has_external_wiki
 
     context 'when ci config path is overridden' do
       before do
-        project.update!(ci_config_path: 'random.yml')
+        project_with_pre_defined_var.update!(ci_config_path: 'random.yml')
       end
 
       it do
@@ -9164,6 +9164,14 @@ def has_external_wiki
     end
   end
 
+  describe '#work_item_status_feature_available?' do
+    let_it_be(:group_project) { create(:project, :in_subgroup) }
+
+    it "return false" do
+      expect(group_project.work_item_status_feature_available?).to be false
+    end
+  end
+
   describe 'serialization' do
     let(:object) { build(:project) }