Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-18 18:09:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-18 18:09:26 +0300
commitb6b9abb7cdb61f18d6fc5222e52486d7f6c482dc (patch)
tree1515d3bd2dec5e8f2705212f4548d3d8e6259a49 /doc
parentba12560b3fcd6e24d0ab7e14ae71917a9a81f6aa (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/api/groups.md2
-rw-r--r--doc/api/pipelines.md19
-rw-r--r--doc/api/project_import_export.md2
-rw-r--r--doc/ci/jobs/ci_job_token.md32
-rw-r--r--doc/development/diffs.md11
-rw-r--r--doc/development/feature_development.md1
-rw-r--r--doc/development/merge_request_diffs.md11
-rw-r--r--doc/development/merge_request_performance_guidelines.md11
-rw-r--r--doc/topics/git/feature_branch_development.md11
-rw-r--r--doc/topics/git/index.md1
-rw-r--r--doc/update/deprecations.md15
-rw-r--r--doc/user/project/import/cvs.md2
-rw-r--r--doc/user/project/import/svn.md11
-rw-r--r--doc/user/project/merge_requests/getting_started.md11
14 files changed, 37 insertions, 103 deletions
diff --git a/doc/api/groups.md b/doc/api/groups.md
index 3d25ced2163..879b10f4b7a 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -27,7 +27,7 @@ Parameters:
| `search` | string | no | Return the list of authorized groups matching the search criteria |
| `order_by` | string | no | Order groups by `name`, `path`, `id`, or `similarity` (if searching, [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/332889) in GitLab 14.1). Default is `name` |
| `sort` | string | no | Order groups in `asc` or `desc` order. Default is `asc` |
-| `statistics` | boolean | no | Include group statistics (administrators only) |
+| `statistics` | boolean | no | Include group statistics (administrators only).<br>*Note:* The REST API response does not provide the full `RootStorageStatistics` data that is shown in the UI. To match the data in the UI, use GraphQL instead of REST. For more information, see the [Group GraphQL reference](../api/graphql/reference/index.md#group).|
| `with_custom_attributes` | boolean | no | Include [custom attributes](custom_attributes.md) in response (administrators only) |
| `owned` | boolean | no | Limit to groups explicitly owned by the current user |
| `min_access_level` | integer | no | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles) |
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md
index 88a0b601a42..fed0e553a9e 100644
--- a/doc/api/pipelines.md
+++ b/doc/api/pipelines.md
@@ -86,7 +86,14 @@ Example of response
## Get a single pipeline
-> `iid` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342223) in GitLab 14.6.
+> - `iid` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342223) in GitLab 14.6.
+> - `name` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310) in GitLab 15.11 [with a flag](../administration/feature_flags.md) named `pipeline_name_in_api`. Disabled by default.
+
+FLAG:
+On self-managed GitLab, by default the `name` field is not available.
+To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md)
+named `pipeline_name_in_api`. This feature is not ready for production use.
+On GitLab.com, this feature is not available.
Get one pipeline from a project.
@@ -113,6 +120,7 @@ Example of response
"id": 46,
"iid": 11,
"project_id": 1,
+ "name": "Build pipeline",
"status": "success",
"ref": "main",
"sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
@@ -281,6 +289,14 @@ Sample response:
## Get the latest pipeline
+> `name` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310) in GitLab 15.11 [with a flag](../administration/feature_flags.md) named `pipeline_name_in_api`. Disabled by default.
+
+FLAG:
+On self-managed GitLab, by default the `name` field is not available.
+To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md)
+named `pipeline_name_in_api`. This feature is not ready for production use.
+On GitLab.com, this feature is not available.
+
Get the latest pipeline for a specific ref in a project.
```plaintext
@@ -302,6 +318,7 @@ Example of response
"id": 287,
"iid": 144,
"project_id": 21,
+ "name": "Build pipeline",
"sha": "50f0acb76a40e34a4ff304f7347dcc6587da8a14",
"ref": "main",
"status": "success",
diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index 0e52bb959cb..98f154c17d7 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -255,7 +255,7 @@ The `Content-Type` header must be `application/gzip`.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/348874) in GitLab 14.9 in [Beta](https://about.gitlab.com/handbook/product/gitlab-the-product/#beta), [with a flag](../administration/feature_flags.md) named `import_project_from_remote_file_s3`. Disabled by default.
> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/348874) in GitLab 14.10.
-> - [Enabled globally](https://gitlab.com/gitlab-org/gitlab/-/issues/350571) in GitLab 15.11.
+> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/350571) in GitLab 15.11. Feature flag `import_project_from_remote_file_s3` removed.
```plaintext
POST /projects/remote-import-s3
diff --git a/doc/ci/jobs/ci_job_token.md b/doc/ci/jobs/ci_job_token.md
index 2c5e309348c..3f1c72c2bd6 100644
--- a/doc/ci/jobs/ci_job_token.md
+++ b/doc/ci/jobs/ci_job_token.md
@@ -30,7 +30,7 @@ job to run. A user can cause a job to run by taking action like pushing a commit
triggering a manual job, or being the owner of a scheduled pipeline. Therefore, this user must be assigned to
[a role that has the required privileges](../../user/permissions.md#gitlab-cicd-permissions).
-The token is valid only while the pipeline job runs. After the job finishes, you can't
+The token is valid only while the pipeline job runs. After the job finishes, you cannot
use the token anymore.
A job token can access a project's resources without any configuration, but it might
@@ -85,35 +85,35 @@ also applies to `CI_REGISTRY_TOKEN`.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/346298/) in GitLab 15.9. [Deployed behind the `:inbound_ci_scoped_job_token` feature flag](../../user/feature_flags.md), enabled by default.
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/346298/) in GitLab 15.10.
-Create an **inbound** allowlist of projects which can access your project through
+Create an allowlist of projects which can access your project through
their `CI_JOB_TOKEN`.
-For example, project `A` can add project `B` to the inbound allowlist. CI/CD jobs
+For example, project `A` can add project `B` to the allowlist. CI/CD jobs
in project `B` (the "allowed project") can now use their CI/CD job token to
authenticate API calls to access project `A`. If project `A` is public or internal,
-the project can be accessed by project `B` without adding it to the inbound allowlist.
+the project can be accessed by project `B` without adding it to the allowlist.
-By default the inbound allowlist of any project only includes itself.
+By default, the allowlist of any project only includes itself.
It is a security risk to disable this feature, so project maintainers or owners should
keep this setting enabled at all times. Add projects to the allowlist only when cross-project
access is needed.
-### Disable the inbound job token scope allowlist
+### Disable the job token scope allowlist
WARNING:
It is a security risk to disable the allowlist. A malicious user could try to compromise
a pipeline created in an unauthorized project. If the pipeline was created by one of
your maintainers, the job token could be used in an attempt to access your project.
-You can disable the inbound job token scope allowlist for testing or a similar reason,
+You can disable the job token scope allowlist for testing or a similar reason,
but you should enable it again as soon as possible.
Prerequisite:
- You must have at least the Maintainer role for the project.
-To disable the inbound job token scope allowlist:
+To disable the job token scope allowlist:
1. On the top bar, select **Main menu > Projects** and find your project.
1. On the left sidebar, select **Settings > CI/CD**.
@@ -123,9 +123,9 @@ To disable the inbound job token scope allowlist:
You can also disable the allowlist [with the API](../../api/graphql/reference/index.md#mutationprojectcicdsettingsupdate).
-### Add a project to the inbound job token scope allowlist
+### Add a project to the job token scope allowlist
-You can add projects to the inbound allowlist for a project. Projects added to the allowlist
+You can add projects to the allowlist for a project. Projects added to the allowlist
can make API calls from running pipelines by using the CI/CD job token.
Prerequisite:
@@ -153,9 +153,9 @@ You can also add a target project to the allowlist [with the API](../../api/grap
NOTE:
This feature is disabled by default for all new projects and is [scheduled for removal](https://gitlab.com/gitlab-org/gitlab/-/issues/383084)
-in GitLab 16.0. Project maintainers or owners should enable the **inbound** access control instead.
+in GitLab 16.0. Project maintainers or owners should enable the access control instead.
-Control your project's job token scope by creating an **outbound** allowlist of projects which
+Control your project's job token scope by creating an allowlist of projects which
can be accessed by your project's job token.
By default, the allowlist includes your current project.
@@ -170,13 +170,13 @@ to make an API request to a private project `B`, then `B` must be added to the a
If project `B` is public or internal, you do not need to add
`B` to the allowlist to grant access.
-### Configure the outbound job token scope
+### Configure the job token scope
Prerequisite:
- You must not have more than 100 projects added to the token's scope.
-To configure the outbound job token scope:
+To configure the job token scope:
1. On the top bar, select **Main menu > Projects** and find your project.
1. On the left sidebar, select **Settings > CI/CD**.
@@ -243,11 +243,11 @@ CI job token failures are usually shown as responses like `404 Not Found` or sim
While troubleshooting CI/CD job token authentication issues, be aware that:
- A [GraphQL example mutation](../../api/graphql/getting_started.md#update-project-settings)
- is available to toggle the inbound outbound scope settings per project.
+ is available to toggle the scope settings per project.
- When the [CI/CD job token scopes](#configure-cicd-job-token-access) are enabled,
and the job token is being used to access a different project:
- The user that executes the job must be a member of the project that is being accessed.
- The user must have the [permissions](../../user/permissions.md) to perform the action.
- - The accessed project must have the project attempting to access it [added to the inbound allowlist](#add-a-project-to-the-inbound-job-token-scope-allowlist).
+ - The accessed project must have the project attempting to access it [added to the allowlist](#add-a-project-to-the-job-token-scope-allowlist).
- The CI job token becomes invalid if the job is no longer running, has been erased,
or if the project is in the process of being deleted.
diff --git a/doc/development/diffs.md b/doc/development/diffs.md
deleted file mode 100644
index c84bf57e085..00000000000
--- a/doc/development/diffs.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'merge_request_concepts/diffs/index.md'
-remove_date: '2023-04-10'
----
-
-This document was moved to [another location](merge_request_concepts/diffs/index.md).
-
-<!-- This redirect file can be deleted after <2023-04-10>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/development/feature_development.md b/doc/development/feature_development.md
index 91f8924a7bd..5547390949d 100644
--- a/doc/development/feature_development.md
+++ b/doc/development/feature_development.md
@@ -80,7 +80,6 @@ Consult these topics for information on contributing to specific GitLab features
- [Sidekiq guidelines](sidekiq/index.md) for working with Sidekiq workers
- [Working with Gitaly](gitaly.md)
- [Advanced search integration docs](advanced_search.md)
-- [Working with merge request diffs](diffs.md)
- [Approval Rules](merge_request_concepts/approval_rules.md)
- [Repository mirroring](repository_mirroring.md)
- [Uploads development guide](uploads/index.md)
diff --git a/doc/development/merge_request_diffs.md b/doc/development/merge_request_diffs.md
deleted file mode 100644
index 9ec7e6cae8b..00000000000
--- a/doc/development/merge_request_diffs.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'merge_request_concepts/diffs/development.md'
-remove_date: '2023-04-10'
----
-
-This document was moved to [another location](merge_request_concepts/diffs/development.md).
-
-<!-- This redirect file can be deleted after <2023-04-10>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/development/merge_request_performance_guidelines.md b/doc/development/merge_request_performance_guidelines.md
deleted file mode 100644
index 1af81a8af9f..00000000000
--- a/doc/development/merge_request_performance_guidelines.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'merge_request_concepts/performance.md'
-remove_date: '2023-04-10'
----
-
-This document was moved to [another location](merge_request_concepts/performance.md).
-
-<!-- This redirect file can be deleted after <2023-04-10>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/topics/git/feature_branch_development.md b/doc/topics/git/feature_branch_development.md
deleted file mode 100644
index 4125d8e8fdb..00000000000
--- a/doc/topics/git/feature_branch_development.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'index.md'
-remove_date: '2023-03-31'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after <2023-03-31>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index 91c3f1971f1..dbd046fc162 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -82,7 +82,6 @@ If you have problems with Git, the following may help:
## Branching strategies
- [Feature branch workflow](../../gitlab-basics/feature_branch_workflow.md)
-- [Develop on a feature branch](feature_branch_development.md)
- [GitLab Flow](../gitlab_flow.md)
- [Git Branching - Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)
- [Git Branching - Branching Workflows](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows)
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index e0054a1024d..d8f12898b08 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1511,21 +1511,6 @@ This could be a breaking change for anyone that developed their own runner that
<div class="deprecation breaking-change" data-milestone="16.0">
-### Remove offset pagination from Jobs API
-
-<div class="deprecation-notes">
-- Announced in: GitLab <span class="milestone">15.9</span>
-- [Breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/)
-</div>
-
-A request to the API for `/api/v4/projects/:id/jobs` can return a paginated list of jobs. Projects can contain hundreds or thousands of jobs, so using an offset to paginate through them is slow. Users should instead use [`keyset-based pagination`](https://docs.gitlab.com/ee/api/rest/index.html#keyset-based-pagination) when requesting consecutive pages of results.
-
-In milestone 16.0 we will remove offset-based pagination.
-
-</div>
-
-<div class="deprecation breaking-change" data-milestone="16.0">
-
### Required Pipeline Configuration is deprecated
<div class="deprecation-notes">
diff --git a/doc/user/project/import/cvs.md b/doc/user/project/import/cvs.md
index 00aebb75a50..99221daf750 100644
--- a/doc/user/project/import/cvs.md
+++ b/doc/user/project/import/cvs.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Migrating from CVS **(FREE)**
[CVS](https://savannah.nongnu.org/projects/cvs) is an old centralized version
-control system similar to [SVN](svn.md).
+control system similar to [SVN](https://subversion.apache.org/).
## CVS vs Git
diff --git a/doc/user/project/import/svn.md b/doc/user/project/import/svn.md
deleted file mode 100644
index c9abc0f459d..00000000000
--- a/doc/user/project/import/svn.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'index.md#import-from-subversion'
-remove_date: '2023-03-15'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after <2023-03-15>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/project/merge_requests/getting_started.md b/doc/user/project/merge_requests/getting_started.md
deleted file mode 100644
index 4125d8e8fdb..00000000000
--- a/doc/user/project/merge_requests/getting_started.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'index.md'
-remove_date: '2023-03-31'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after <2023-03-31>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->