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/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-22 15:10:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-22 15:10:37 +0300
commitf2d662be68fb15a2b38abaff576693f2b8f2c2f3 (patch)
tree226f6281ecaf11fcab954a96780a9bc58eb3f08a /doc/ci
parent672f729cf283c4495ccf5071007e25b33c30daff (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/jobs/job_artifacts.md6
-rw-r--r--doc/ci/pipelines/merge_request_pipelines.md4
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/ci/jobs/job_artifacts.md b/doc/ci/jobs/job_artifacts.md
index 0c9dd658ce2..d88a9ec09dd 100644
--- a/doc/ci/jobs/job_artifacts.md
+++ b/doc/ci/jobs/job_artifacts.md
@@ -334,7 +334,7 @@ With this configuration, GitLab adds **artifact 1** as a link to `file.txt` to t
By default artifacts are always kept for successful pipelines for the most recent commit on
each ref. This means that the latest artifacts do not immediately expire according
-to the `expire_in` specification.
+to the `expire_in` configuration.
If a pipeline for a new commit on the same ref completes successfully, the previous pipeline's
artifacts are deleted according to the `expire_in` configuration. The artifacts
@@ -350,6 +350,10 @@ a project, you can disable this behavior to save space:
1. Expand **Artifacts**.
1. Clear the **Keep artifacts from most recent successful jobs** checkbox.
+After disabling this setting, all new artifacts expire according to the `expire_in` configuration.
+Artifacts in old pipelines continue to be kept until a new pipeline runs for the same ref.
+Then the artifacts in the earlier pipeline for that ref are allowed to expire too.
+
You can disable this behavior for all projects on a self-managed instance in the
[instance's CI/CD settings](../../user/admin_area/settings/continuous_integration.md#keep-the-latest-artifacts-for-all-jobs-in-the-latest-successful-pipelines).
diff --git a/doc/ci/pipelines/merge_request_pipelines.md b/doc/ci/pipelines/merge_request_pipelines.md
index 135af4bb69e..045fa8dc16c 100644
--- a/doc/ci/pipelines/merge_request_pipelines.md
+++ b/doc/ci/pipelines/merge_request_pipelines.md
@@ -168,9 +168,7 @@ When you use merge request pipelines, you can use:
- All the same [predefined variables](../variables/predefined_variables.md) that are
available in branch pipelines.
- [Additional predefined variables](../variables/predefined_variables.md#predefined-variables-for-merge-request-pipelines)
- available only to jobs in merge request pipelines. These variables contain
- information from the associated merge request, which can be when calling the
- [GitLab Merge Request API endpoint](../../api/merge_requests.md) from a job.
+ available only to jobs in merge request pipelines.
## Troubleshooting