From f475f21f78faa82b9a2781b37ff9d0b63b23a512 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Nov 2023 18:07:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- Gemfile | 4 ++-- Gemfile.checksum | 4 ++-- Gemfile.lock | 10 +++++----- doc/administration/integration/plantuml.md | 9 ++++----- .../application_security/vulnerabilities/index.md | 5 +++-- doc/user/group/value_stream_analytics/index.md | 15 +++++++++------ doc/user/okrs.md | 18 ++++++++++++++++++ doc/user/packages/npm_registry/index.md | 8 ++++++-- doc/user/project/repository/forking_workflow.md | 7 +++++++ doc/user/tasks.md | 19 +++++++++++++++++++ 10 files changed, 75 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index a8dbdd3700f..e90064b44b2 100644 --- a/Gemfile +++ b/Gemfile @@ -142,7 +142,7 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/Missing gem 'graphql', '~> 2.0.27', feature_category: :api gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.8.0', feature_category: :api -gem 'apollo_upload_server', '~> 2.1.0', feature_category: :api +gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api gem 'graphlient', '~> 0.5.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data @@ -196,7 +196,7 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.185.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.186.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index b7ad54aef17..b4e04525b97 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -21,7 +21,7 @@ {"name":"aliyun-sdk","version":"0.8.0","platform":"ruby","checksum":"65915d3f9b528082253d1f9ad0e4d13d6b552933fe49251c68c6915cd4d75b9d"}, {"name":"amatch","version":"0.4.1","platform":"ruby","checksum":"d3ff15226a2e627c72802e94579db829e5e10c96cf89d329494caec5889145f7"}, {"name":"android_key_attestation","version":"0.3.0","platform":"ruby","checksum":"467eb01a99d2bb48ef9cf24cc13712669d7056cba5a52d009554ff037560570b"}, -{"name":"apollo_upload_server","version":"2.1.0","platform":"ruby","checksum":"e5f3c9dda0c2ca775d007072742b98d517dfd91a667111fedbcdc94dfabd904e"}, +{"name":"apollo_upload_server","version":"2.1.5","platform":"ruby","checksum":"0f66bea96bdf7ce8b7278712ebafc8a26b82864ea6541213b58d9b3f673413a5"}, {"name":"app_store_connect","version":"0.29.0","platform":"ruby","checksum":"01d7a923825a4221892099acb5a72f86f6ee7d8aa95815d3c459ba6816ea430f"}, {"name":"arr-pm","version":"0.0.12","platform":"ruby","checksum":"fdff482f75239239201f4d667d93424412639aad0b3b0ad4d827e7c637e0ad39"}, {"name":"asciidoctor","version":"2.0.18","platform":"ruby","checksum":"bbd1e1d16deed8db94bf9624b9f4474fac32d9ca7225d377f076c08d9adde387"}, @@ -37,7 +37,7 @@ {"name":"aws-eventstream","version":"1.2.0","platform":"ruby","checksum":"ffa53482c92880b001ff2fb06919b9bb82fd847cbb0fa244985d2ebb6dd0d1df"}, {"name":"aws-partitions","version":"1.761.0","platform":"ruby","checksum":"291e444e1edfc92c5521a6dbdd1236ccc3f122b3520163b2be6ec5b6ef350ef2"}, {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"}, -{"name":"aws-sdk-core","version":"3.185.2","platform":"ruby","checksum":"75878c00df67750de85537cc851b1281770f2270392de73b9dedcecba314b0ce"}, +{"name":"aws-sdk-core","version":"3.186.0","platform":"ruby","checksum":"5ed564f83f334010c532d55f215068cc833aad40be41fe3dc851b08f1321f4a7"}, {"name":"aws-sdk-kms","version":"1.64.0","platform":"ruby","checksum":"40de596c95047bfc6e1aacea24f3df6241aa716b6f7ce08ac4c5f7e3120395ad"}, {"name":"aws-sdk-s3","version":"1.136.0","platform":"ruby","checksum":"3547302a85d51de6cc75b48fb37d328f65f6526e7fc73a27a5b1b871f99a8d63"}, {"name":"aws-sigv4","version":"1.6.0","platform":"ruby","checksum":"ca9e6a15cd424f1f32b524b9760995331459bc22e67d3daad4fcf0c0084b087d"}, diff --git a/Gemfile.lock b/Gemfile.lock index dc7495b058b..787d53c97f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,8 +246,8 @@ GEM mize tins (~> 1.0) android_key_attestation (0.3.0) - apollo_upload_server (2.1.0) - actionpack (>= 4.2) + apollo_upload_server (2.1.5) + actionpack (>= 6.1.6) graphql (>= 1.8) app_store_connect (0.29.0) activesupport (>= 6.0.0) @@ -273,7 +273,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.185.2) + aws-sdk-core (3.186.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -1746,7 +1746,7 @@ DEPENDENCIES acts-as-taggable-on (~> 10.0) addressable (~> 2.8) akismet (~> 3.0) - apollo_upload_server (~> 2.1.0) + apollo_upload_server (~> 2.1.5) app_store_connect arr-pm (~> 0.0.12) asciidoctor (~> 2.0.18) @@ -1758,7 +1758,7 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.185.2) + aws-sdk-core (~> 3.186.0) aws-sdk-s3 (~> 1.136.0) axe-core-rspec babosa (~> 2.0) diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md index 0155f0300d4..dae400ff755 100644 --- a/doc/administration/integration/plantuml.md +++ b/doc/administration/integration/plantuml.md @@ -180,7 +180,7 @@ see the [Tomcat Documentation](https://tomcat.apache.org/tomcat-10.1-doc/index.h 1. Install and configure Tomcat 10: ```shell - wget https://dlcdn.apache.org/tomcat/tomcat-10/v10.1.9/bin/apache-tomcat-10.1.9.tar.gz -P /tmp + wget https://dlcdn.apache.org/tomcat/tomcat-10/v10.1.15/bin/apache-tomcat-10.1.15.tar.gz -P /tmp sudo tar xzvf /tmp/apache-tomcat-10*tar.gz -C /opt/tomcat --strip-components=1 sudo chown -R tomcat:tomcat /opt/tomcat/ sudo chmod -R u+x /opt/tomcat/bin @@ -266,12 +266,11 @@ see the [Tomcat Documentation](https://tomcat.apache.org/tomcat-10.1-doc/index.h 1. Install PlantUML and copy the `.war` file: - Use the [latest release](https://github.com/plantuml/plantuml-server/releases) of plantuml-jsp (example: plantuml-jsp-v1.2023.8.war). For context, see [this issue](https://github.com/plantuml/plantuml-server/issues/265). + Use the [latest release](https://github.com/plantuml/plantuml-server/releases) of plantuml-jsp (example: plantuml-jsp-v1.2023.12.war). For context, see [this issue](https://github.com/plantuml/plantuml-server/issues/265). ```shell - cd / - wget https://github.com/plantuml/plantuml-server/releases/download/v1.2023.8/plantuml-jsp-v1.2023.8.war - sudo cp plantuml-jsp-v1.2023.8.war /opt/tomcat/webapps/plantuml.war + wget -P /tmp https://github.com/plantuml/plantuml-server/releases/download/v1.2023.12/plantuml-jsp-v1.2023.12.war + sudo cp /tmp/plantuml-jsp-v1.2023.12.war /opt/tomcat/webapps/plantuml.war sudo chown tomcat:tomcat /opt/tomcat/webapps/plantuml.war sudo systemctl restart tomcat ``` diff --git a/doc/user/application_security/vulnerabilities/index.md b/doc/user/application_security/vulnerabilities/index.md index 326ee48eb49..b53c3b03f30 100644 --- a/doc/user/application_security/vulnerabilities/index.md +++ b/doc/user/application_security/vulnerabilities/index.md @@ -152,8 +152,9 @@ The issue is then opened so you can take further action. Prerequisites: -- [Enable Jira integration](../../../integration/jira/index.md). The **Enable Jira issue creation - from vulnerabilities** option must be selected as part of the configuration. +- [Enable Jira integration](../../../integration/jira/configure.md). The + **Enable Jira issue creation from vulnerabilities** option must be selected as part + of the configuration. - Each user must have a personal Jira user account with permission to create issues in the target project. diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md index df9986e32e7..2ed01a0ec05 100644 --- a/doc/user/group/value_stream_analytics/index.md +++ b/doc/user/group/value_stream_analytics/index.md @@ -125,14 +125,17 @@ To view when the data was most recently updated, in the right corner next to **E ### How value stream analytics measures stages Value stream analytics measures each stage from its start event to its end event. +Only items that have reached their end event are included in the stage time calculation. -For example, a stage might start when a user adds a label to an issue, and ends when they add another label. -Items aren't included in the stage time calculation if they have not reached the end event. +By default, blocked issues are not included in the life cycle overview. +However, you can use custom labels (for example `workflow::blocked`) to track them. -Value stream analytics allows you to customize your stages based on pre-defined events. To make the -configuration easier, GitLab provides a pre-defined list of stages that can be used as a template +You can customize stages in value stream analytics based on pre-defined events. +To help you with the configuration, GitLab provides a pre-defined list of stages that you can use as a template. +For example, you can define a stage that starts when you add a label to an issue, +and ends when you add another label. -Each pre-defined stages of value stream analytics is further described in the table below. +The following table gives an overview of the pre-defined stages in value stream analytics. | Stage | Measurement method | | ------- | -------------------- | @@ -156,7 +159,7 @@ If a stage does not include a start and a stop time, its data is not included in In this example, milestones have been created and CI/CD for testing and setting environments is configured. - 09:00: Create issue. **Issue** stage starts. -- 11:00: Add issue to a milestone, start work on the issue, and create a branch locally. +- 11:00: Add issue to a milestone (or backlog), start work on the issue, and create a branch locally. **Issue** stage stops and **Plan** stage starts. - 12:00: Make the first commit. - 12:30: Make the second commit to the branch that mentions the issue number. diff --git a/doc/user/okrs.md b/doc/user/okrs.md index 46390cd0275..ca5882da22a 100644 --- a/doc/user/okrs.md +++ b/doc/user/okrs.md @@ -399,6 +399,24 @@ To turn off a check-in reminder, enter: /checkin_reminder never ``` +## Set an objective as a parent + +> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/11198) in GitLab 16.6. + +Prerequisite: + +- You must have at least the Reporter role for the project. +- The parent objective and child OKR must belong to the same project. + +To set an objective as a parent of an OKR: + +1. [Open the objective](#view-an-objective) or [key result](#view-a-key-result) that you want to edit. +1. Next to **Parent**, from the dropdown list, select the parent to add. +1. Select any area outside the dropdown list. + +To remove the parent of the objective or key result, +next to **Parent**, select the dropdown list and then select **Unassign**. + ## Confidential OKRs > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/8410) in GitLab 15.3. diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index 9d789c27d1f..ac0c0dd8629 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -87,6 +87,10 @@ Your package should now publish to the Package Registry. When publishing by using a CI/CD pipeline, you can use the [predefined variables](../../../ci/variables/predefined_variables.md) `${CI_PROJECT_ID}` and `${CI_JOB_TOKEN}` to authenticate with your project's Package Registry. We use these variables to create a `.npmrc` file [for authentication](#authenticating-via-the-npmrc) during execution of your CI/CD job. +WARNING: +When generating the `.npmrc` file, do not specify the port after `${CI_SERVER_HOST}` if it is a default port, +such as `80` for a URL starting with `http` or `443` for a URL starting with `https`. + In the GitLab project containing your `package.json`, edit or create a `.gitlab-ci.yml` file. For example: ```yaml @@ -98,8 +102,8 @@ stages: publish-npm: stage: deploy script: - - echo "@scope:registry=https://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/" > .npmrc - - echo "//${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}" >> .npmrc + - echo "@scope:registry=https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/" > .npmrc + - echo "//${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}" >> .npmrc - npm publish ``` diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md index ddc650c3924..c71c89b68c3 100644 --- a/doc/user/project/repository/forking_workflow.md +++ b/doc/user/project/repository/forking_workflow.md @@ -24,17 +24,24 @@ can access the object pool connected to the source project. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15013) a new form in GitLab 13.11 [with a flag](../../../user/feature_flags.md) named `fork_project_form`. Disabled by default. > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77181) in GitLab 14.8. Feature flag `fork_project_form` removed. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24894) in GitLab 16.6. To fork an existing project in GitLab: 1. On the project's homepage, in the upper-right corner, select **Fork** (**{fork}**): + ![Fork this project](img/forking_workflow_fork_button_v13_10.png) + 1. Optional. Edit the **Project name**. 1. For **Project URL**, select the [namespace](../../namespace/index.md) your fork should belong to. 1. Add a **Project slug**. This value becomes part of the URL to your fork. It must be unique in the namespace. 1. Optional. Add a **Project description**. +1. Select one of the **Branches to include** options: + - **All branches** (default). + - **Only the default branch**. Uses the `--single-branch` and `--no-tags` + [Git options](https://git-scm.com/docs/git-clone). 1. Select the **Visibility level** for your fork. For more information about visibility levels, read [Project and group visibility](../../public_access.md). 1. Select **Fork project**. diff --git a/doc/user/tasks.md b/doc/user/tasks.md index 347aedd6e74..173d2e44cf1 100644 --- a/doc/user/tasks.md +++ b/doc/user/tasks.md @@ -360,6 +360,25 @@ To copy the task's email address: 1. Select **Plan > Issues**, then select your issue to view it. 1. In the top right corner, select the vertical ellipsis (**{ellipsis_v}**), then select **Copy task email address**. +## Set an issue as a parent + +> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/11198) in GitLab 16.5. + +Prerequisite: + +- You must have at least the Reporter role for the project. +- The issue and task must belong to the same project. + +To set an issue as a parent of a task: + +1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. + The task window opens. +1. Next to **Parent**, from the dropdown list, select the parent to add. +1. Select any area outside the dropdown list. + +To remove the parent item of the task, +next to **Parent**, select the dropdown list and then select **Unassign**. + ## Confidential tasks > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/8410) in GitLab 15.3. -- cgit v1.2.3