Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -14,6 +14,10 @@
 .spec-file-specified: &spec-file-specified
   if: $QA_TESTS =~ /_spec\.rb/
 
+# code pattern changes
+.code-pattern-changes: &code-pattern-changes
+  if: $MR_CODE_PATTERNS == "true"
+
 # Specs directory specified
 .spec-directory-specified: &spec-directory-specified
   if: $QA_TESTS != "" && $QA_TESTS !~ /_spec\.rb/

.gitlab/ci/rules.gitlab-ci.yml

@@ -1623,6 +1623,10 @@
         UPDATE_QA_CACHE: "true"
     - <<: *if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified
       changes: *code-patterns
+    - <<: *if-merge-request
+      changes: *code-patterns
+      variables:
+        MR_CODE_PATTERNS: "true"
     - <<: *if-merge-request
       changes: *code-qa-patterns # Includes all CI changes
     - <<: *if-force-ci

.gitlab/ci/test-on-gdk/main.gitlab-ci.yml

@@ -3,6 +3,55 @@ include:
   - local: .gitlab/ci/qa-common/main.gitlab-ci.yml
   - local: .gitlab/ci/qa-common/rules.gitlab-ci.yml
   - local: .gitlab/ci/qa-common/variables.gitlab-ci.yml
+  - component: "gitlab.com/gitlab-org/quality/pipeline-common/[email protected]"
+    inputs:
+      job_name: "e2e-test-report"
+      job_stage: "report"
+      aws_access_key_id_variable_name: "QA_ALLURE_AWS_ACCESS_KEY_ID"
+      aws_secret_access_key_variable_name: "QA_ALLURE_AWS_SECRET_ACCESS_KEY"
+      gitlab_auth_token_variable_name: "PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE"
+      allure_results_glob: "qa/tmp/allure-results"
+      allure_ref_slug: "${CI_COMMIT_REF_SLUG}"
+      allure_project_path: "${CI_PROJECT_PATH}"
+      allure_merge_request_iid: "${CI_MERGE_REQUEST_IID}"
+      allure_job_name: "${QA_RUN_TYPE}"
+
+# code pattern changes
+.code-pattern-changes: &code-pattern-changes
+  if: $MR_CODE_PATTERNS == "true"
+
+# Run all tests when QA framework changes present, full suite execution is explicitly enabled or a feature flag file is removed
+.qa-run-all-tests: &qa-run-all-tests
+  if: $QA_FRAMEWORK_CHANGES == "true" || $QA_RUN_ALL_TESTS == "true" || $QA_RUN_ALL_E2E_LABEL == "true" || $QA_FEATURE_FLAGS =~ /deleted/
+
+variables:
+  COLORIZED_LOGS: "true"
+  GIT_DEPTH: "20"
+  GIT_STRATEGY: "clone" # 'GIT_STRATEGY: clone' optimizes the pack-objects cache hit ratio
+  GIT_SUBMODULE_STRATEGY: "none"
+
+.rules:gdk:qa-selective:
+  rules:
+    - <<: *code-pattern-changes
+      when: never
+    - !reference [.rules:test:qa-selective, rules]
+    - if: $QA_SUITES =~ /Test::Instance::Blocking/
+
+.rules:gdk:qa-parallel:
+  rules:
+    - *code-pattern-changes
+    - !reference [.rules:test:qa-parallel, rules]
+    - if: $QA_SUITES =~ /Test::Instance::Blocking/
+
+.rules:gdk:qa-smoke:
+  rules:
+    - <<: *code-pattern-changes
+      variables:
+        QA_TESTS: ""
+    - <<: *qa-run-all-tests
+      variables:
+        QA_TESTS: ""
+    - if: $QA_SUITES =~ /Test::Instance::Smoke/
 
 .gdk-qa-base:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-2.3-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23
@@ -70,27 +119,10 @@ include:
     expire_in: 7 days
     when: always
 
-# Take the existing GDK docker image and reconfigure it with Postgres load
-# balancing. Adding 5s lag to 1 of the replicas to validate robustness of
-# the load balancer.
-.gdk-with-load-balancer-setup:
-  before_script:
-    - !reference [".gdk-qa-base", "before_script"]
-    - |
-      docker exec gdk bash -c "
-        gdk config set postgresql.replica.enabled true &&\
-        gdk config set postgresql.replica_2.enabled true &&\
-        gdk config set load_balancing.enabled true &&\
-        gdk reconfigure &&\
-        gdk restart"
-
 download-knapsack-report:
   extends:
     - .download-knapsack-report
     - .rules:download-knapsack
-  needs:
-    - pipeline: $PARENT_PIPELINE_ID
-      job: build-qa-image
 
 cache-gems:
   extends:
@@ -103,23 +135,33 @@ cache-gems:
   script:
     - cd qa && bundle install
 
+# Take the existing GDK docker image and reconfigure it with Postgres load
+# balancing. Adding 5s lag to 1 of the replicas to validate robustness of
+# the load balancer.
+.gdk-with-load-balancer-setup:
+  before_script:
+    - !reference [".gdk-qa-base", "before_script"]
+    - |
+      docker exec gdk bash -c "
+        gdk config set postgresql.replica.enabled true &&\
+        gdk config set postgresql.replica_2.enabled true &&\
+        gdk config set load_balancing.enabled true &&\
+        gdk reconfigure &&\
+        gdk restart"
+
 download-fast-quarantine-report:
   extends:
     - .download-fast-quarantine-report
     - .rules:download-fast-quarantine-report
 
-# ==========================================
-# Test stage
-# ==========================================
 gdk-qa-smoke:
   extends:
     - .gdk-qa-base
     - .gitlab-qa-report
+    - .rules:gdk:qa-smoke
   variables:
     QA_SCENARIO: Test::Instance::Smoke
     QA_RUN_TYPE: gdk-qa-smoke
-  rules:
-    - when: always
 
 gdk-qa-smoke-with-load-balancer:
   extends:
@@ -143,12 +185,20 @@ gdk-qa-reliable:
     - .gdk-qa-base
     - .gitlab-qa-report
     - .parallel
+    - .rules:gdk:qa-parallel
   variables:
     QA_SCENARIO: Test::Instance::Blocking
     QA_RUN_TYPE: gdk-qa-blocking
   parallel: 10
-  rules:
-    - when: always
+
+gdk-qa-reliable-selective:
+  extends:
+    - .gdk-qa-base
+    - .gitlab-qa-report
+    - .rules:gdk:qa-selective
+  variables:
+    QA_SCENARIO: Test::Instance::Blocking
+    QA_RUN_TYPE: gdk-qa-blocking
 
 gdk-qa-reliable-with-load-balancer:
   extends:
@@ -184,8 +234,6 @@ gdk-qa-non-blocking:
 # ==========================================
 e2e-test-report:
   extends: .rules:report:allure-report
-  variables:
-    ALLURE_REPORT_RESULTS_GLOB: "qa/tmp/allure-results"
 
 upload-knapsack-report:
   extends:

app/finders/packages/packages_finder.rb

@@ -22,6 +22,7 @@ def execute
       packages = filter_by_package_type(packages)
       packages = filter_by_package_name(packages)
       packages = filter_by_status(packages)
+      packages = filter_by_package_version(packages)
       order_packages(packages)
     end
 

app/graphql/resolvers/packages_base_resolver.rb

@@ -19,6 +19,11 @@ class PackagesBaseResolver < BaseResolver
         required: false,
         default_value: nil
 
+    argument :package_version, GraphQL::Types::String,
+        description: 'Filter a package by version.',
+        required: false,
+        default_value: nil
+
     argument :status, Types::Packages::PackageStatusEnum,
         description: 'Filter a package by status.',
         required: false,

doc/administration/gitaly/recovery.md

@@ -15,12 +15,17 @@ You can add and replace Gitaly nodes on a Gitaly Cluster.
 
 ### Add new Gitaly nodes
 
-To add a new Gitaly node to a Gitaly Cluster that has [replication factor](praefect.md#configure-replication-factor):
+The steps to add a new Gitaly node to a Gitaly Cluster depend on whether a [custom replication factor](praefect.md#configure-replication-factor) is set.
 
-- Set, set the [replication factor](praefect.md#configure-replication-factor) for each repository using `set-replication-factor` Praefect command. New repositories are
-  replicated based on [replication factor](praefect.md#configure-replication-factor). Praefect doesn't automatically replicate existing repositories to the new Gitaly node.
-- Not set, add the new node in your [Praefect configuration](praefect.md#praefect) under `praefect['virtual_storages']`. Praefect automatically replicates all data to any
-  new Gitaly node added to the configuration.
+#### Custom replication factor
+
+If a custom replication factor is set, set the [replication factor](praefect.md#configure-replication-factor) for each repository using the
+`set-replication-factor` Praefect command. New repositories are replicated based on the [replication factor](praefect.md#configure-replication-factor). Praefect doesn't automatically replicate existing repositories to the new Gitaly node.
+
+#### Default replication factor
+
+If the default replication factor is used, add the new node in your [Praefect configuration](praefect.md#praefect) under `praefect['virtual_storages']`.
+Praefect automatically replicates all data to any new Gitaly node added to the configuration.
 
 ### Replace an existing Gitaly node
 
@@ -33,32 +38,37 @@ To use the same name for the replacement node, use [repository verifier](praefec
 
 #### With a node with a different name
 
-To use a different name for the replacement node for a Gitaly Cluster that has [replication factor](praefect.md#configure-replication-factor):
+The steps use a different name for the replacement node for a Gitaly Cluster depend on if a [custom replication factor](praefect.md#configure-replication-factor)
+is set.
 
-- Set, use [`praefect set-replication-factor`](praefect.md#configure-replication-factor) to set the replication factor per repository again to get new storage assigned.
-  For example:
+##### Custom replication factor set
 
-  ```shell
-  $ sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml set-replication-factor -virtual-storage default -relative-path @hashed/3f/db/3fdba35f04dc8c462986c992bcf875546257113072a909c162f7e470e581e278.git -replication-factor 2
+If a custom replication factor is set, use [`praefect set-replication-factor`](praefect.md#configure-replication-factor) to set the replication factor per repository again to get new storage assigned. For example:
 
-  current assignments: gitaly-1, gitaly-2
-  ```
+```shell
+$ sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml set-replication-factor -virtual-storage default -relative-path @hashed/3f/db/3fdba35f04dc8c462986c992bcf875546257113072a909c162f7e470e581e278.git -replication-factor 2
+
+current assignments: gitaly-1, gitaly-2
+```
+
+To reassign all repositories from the old storage to the new one, after configuring the new Gitaly node:
 
-  To reassign all repositories from the old storage to the new one, after configuring the new Gitaly node:
+1. Connect to Praefect database:
 
-  1. Connect to Praefect database:
+   ```shell
+   /opt/gitlab/embedded/bin/psql -h <psql host> -U <user> -d <database name>
+   ```
 
-     ```shell
-     /opt/gitlab/embedded/bin/psql -h <psql host> -U <user> -d <database name>
-     ```
+1. Update the `repository_assignments` table to replace the old Gitaly node name (for example, `old-gitaly`) with the new Gitaly node name
+   (for example, `new-gitaly`):
 
-  1. Update `repository_assignments` table to replace the old Gitaly node name (for example, `old-gitaly`) with the new Gitaly node name (for example, `new-gitaly`):
+   ```sql
+   UPDATE repository_assignments SET storage='new-gitaly' WHERE storage='old-gitaly';
+   ```
 
-     ```sql
-     UPDATE repository_assignments SET storage='new-gitaly' WHERE storage='old-gitaly';
-     ```
+##### Default replication factor
 
-- Not set, replace the node in the configuration. The old node's state remains in the Praefect database but it is ignored.
+If the default replication factor is used, replace the node in the configuration. The old node's state remains in the Praefect database but it is ignored.
 
 ## Primary node failure
 

doc/administration/settings/jira_cloud_app.md

@@ -45,6 +45,17 @@ To create an OAuth application on your self-managed instance:
 1. Paste the **Application ID** value into **Jira Connect Application ID**.
 1. Select **Save changes**.
 
+## Jira user requirements
+
+You must ensure that the Jira user that is used to setup the GitLab for Jira Cloud app is a member of the Site Administrators (`site-admins`) group in your
+[Atlassian organization](https://admin.atlassian.com):
+
+1. If you don't have a `site-admins` group in your Atlassian organization, [create the group](https://support.atlassian.com/user-management/docs/create-groups/).
+1. If not already a member, [add your Jira user as a member](https://support.atlassian.com/user-management/docs/edit-a-group/) of the `site-admins` group.
+
+If you have customized your global permissions in Jira, you might also need to grant the
+[`Browse users and groups` permission](https://confluence.atlassian.com/jirakb/unable-to-browse-for-users-and-groups-120521888.html) to the Jira user.
+
 ## Connect the GitLab for Jira Cloud app
 
 > Introduced in GitLab 15.7.
@@ -76,6 +87,7 @@ With this method:
   - Set up an internet-facing reverse proxy in front of your self-managed instance. To secure this proxy further, only allow inbound
     traffic from [Atlassian IP addresses](https://support.atlassian.com/organization-administration/docs/ip-addresses-and-domains-for-atlassian-cloud-products/#Outgoing-Connections).
   - Add [GitLab IP addresses](../../user/gitlab_com/index.md#ip-range) to the allowlist of your firewall.
+- The Jira user that installs and configures the GitLab for Jira Cloud app must meet certain [requirements](#jira-user-requirements).
 
 ### Set up your instance
 
@@ -144,6 +156,7 @@ To support your self-managed instance with Jira Cloud, do one of the following:
 
 - The instance must be publicly available.
 - You must set up [OAuth authentication](#set-up-oauth-authentication).
+- The Jira user that installs and configures the GitLab for Jira Cloud app must meet certain [requirements](#jira-user-requirements).
 
 ### Install the app in development mode
 
@@ -349,9 +362,6 @@ When you check the browser console, you might see the following message:
 Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at https://gitlab.example.com/-/jira_connect/oauth_application_id. (Reason: CORS header 'Access-Control-Allow-Origin' missing). Status code: 403.
 ```
 
-`403` status code is returned if:
-
-- The user information cannot be fetched from Jira.
-- The authenticated Jira user does not have [site administrator](https://support.atlassian.com/user-management/docs/give-users-admin-permissions/#Make-someone-a-site-admin) access.
+`403` status code is returned if the user information cannot be fetched from Jira because of insufficient permissions.
 
-To resolve this issue, ensure the authenticated user is a Jira site administrator and try again.
+To resolve this issue, ensure that the Jira user that installs and configures the GitLab for Jira Cloud app meets certain [requirements](#jira-user-requirements).

doc/api/graphql/reference/index.md

@@ -18884,6 +18884,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="grouppackagesincludeversionless"></a>`includeVersionless` | [`Boolean`](#boolean) | Include versionless packages. |
 | <a id="grouppackagespackagename"></a>`packageName` | [`String`](#string) | Search a package by name. |
 | <a id="grouppackagespackagetype"></a>`packageType` | [`PackageTypeEnum`](#packagetypeenum) | Filter a package by type. |
+| <a id="grouppackagespackageversion"></a>`packageVersion` | [`String`](#string) | Filter a package by version. |
 | <a id="grouppackagessort"></a>`sort` | [`PackageGroupSort`](#packagegroupsort) | Sort packages by this criteria. |
 | <a id="grouppackagesstatus"></a>`status` | [`PackageStatus`](#packagestatus) | Filter a package by status. |
 
@@ -23826,6 +23827,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="projectpackagesincludeversionless"></a>`includeVersionless` | [`Boolean`](#boolean) | Include versionless packages. |
 | <a id="projectpackagespackagename"></a>`packageName` | [`String`](#string) | Search a package by name. |
 | <a id="projectpackagespackagetype"></a>`packageType` | [`PackageTypeEnum`](#packagetypeenum) | Filter a package by type. |
+| <a id="projectpackagespackageversion"></a>`packageVersion` | [`String`](#string) | Filter a package by version. |
 | <a id="projectpackagessort"></a>`sort` | [`PackageSort`](#packagesort) | Sort packages by this criteria. |
 | <a id="projectpackagesstatus"></a>`status` | [`PackageStatus`](#packagestatus) | Filter a package by status. |
 

doc/api/packages.md

@@ -30,6 +30,7 @@ GET /projects/:id/packages
 | `sort`    | string | no | The direction of the order, either `asc` (default) for ascending order or `desc` for descending order. |
 | `package_type` | string | no | Filter the returned packages by type. One of `conan`, `maven`, `npm`, `pypi`, `composer`, `nuget`, `helm`, `terraform_module`, or `golang`. (_Introduced in GitLab 12.9_)
 | `package_name` | string | no | Filter the project packages with a fuzzy search by name. (_Introduced in GitLab 12.9_)
+| `package_version` | string | no | Filter the project packages by version. (_[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/349065) in GitLab 16.6_)
 | `include_versionless` | boolean | no | When set to true, versionless packages are included in the response. (_Introduced in GitLab 13.8_)
 | `status` | string | no | Filter the returned packages by status. One of `default` (default), `hidden`, `processing`, `error`, or `pending_destruction`. (_Introduced in GitLab 13.9_)
 
@@ -97,6 +98,7 @@ GET /groups/:id/packages
 | `sort`    | string | no | The direction of the order, either `asc` (default) for ascending order or `desc` for descending order. |
 | `package_type` | string | no | Filter the returned packages by type. One of `conan`, `maven`, `npm`, `pypi`, `composer`, `nuget`, `helm`, or `golang`. (_Introduced in GitLab 12.9_) |
 | `package_name` | string | no | Filter the project packages with a fuzzy search by name. (_[Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30980) in GitLab 13.0_)
+| `package_version` | string | no | Filter the returned packages by version. (_[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/349065) in GitLab 16.6_)
 | `include_versionless` | boolean | no | When set to true, versionless packages are included in the response. (_Introduced in GitLab 13.8_)
 | `status` | string | no | Filter the returned packages by status. One of `default` (default), `hidden`, `processing`, `error`, or `pending_destruction`. (_Introduced in GitLab 13.9_)
 

doc/development/api_graphql_styleguide.md

@@ -154,11 +154,14 @@ developers must familiarize themselves with our [Deprecation and Removal process
 Breaking changes are:
 
 - Removing or renaming a field, argument, enum value, or mutation.
-- Changing the type or type name of an argument. This is because the type of an argument
+- Changing the type or type name of an argument. The type of an argument
   is declared by the client when [using variables](https://graphql.org/learn/queries/#variables),
-  and queries with the old type name would be rejected by the API.
-- Changing the _scalar type_ of a field or enum value. Object types can be changed so long as all
-  scalar type fields of the object remain the same.
+  and a change would cause a query using the old type name to be rejected by the API.
+- Changing the [_scalar type_](https://graphql.org/learn/schema/#scalar-types) of a field or enum
+  value where it results in a change to how the value serializes to JSON.
+  For example, a change from a JSON String to a JSON Number, or a change to how a String is formatted.
+  A change to another [_object type_](https://graphql.org/learn/schema/#object-types-and-fields) can be
+  allowed so long as all scalar type fields of the object continue to serialize in the same way.
 - Raising the [complexity](#max-complexity) of a field or complexity multipliers in a resolver.
 - Changing a field from being _not_ nullable (`null: false`) to nullable (`null: true`), as
 discussed in [Nullable fields](#nullable-fields).

doc/integration/jira/connect-app.md

@@ -107,9 +107,7 @@ After you connect the GitLab for Jira Cloud app, you might get this error:
 Failed to link group. Please try again.
 ```
 
-`403` status code is returned if:
+`403` status code is returned if the user information cannot be fetched from Jira due to insufficient permissions.
 
-- The user information cannot be fetched from Jira.
-- The authenticated Jira user does not have [site administrator](https://support.atlassian.com/user-management/docs/give-users-admin-permissions/#Make-someone-a-site-admin) access.
-
-To resolve this issue, ensure the authenticated user is a Jira site administrator and try again.
+To resolve this issue, ensure that the Jira user that installs and configures the GitLab for Jira Cloud app meets certain
+[requirements](../../administration/settings/jira_cloud_app.md#jira-user-requirements).