From cfc792b9ca064990e6540cb742e80529ea669a81 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 10 Dec 2019 07:53:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/project/pipelines/settings.md | 35 ++++++++++++++----------- doc/user/project/repository/forking_workflow.md | 4 +++ 2 files changed, 23 insertions(+), 16 deletions(-) (limited to 'doc/user/project') diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 671a55da5e3..ca888c69b37 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -73,37 +73,40 @@ For information about setting a maximum artifact size for a project, see By default we look for the `.gitlab-ci.yml` file in the project's root directory. If needed, you can specify an alternate path and file name, including locations outside the project. -Hosting the configuration file in a separate project will allow stricter control of the -configuration file. You can limit access to the project hosting the configuration to only people -with proper authorization, and users can use the configuration for their pipelines, -without being able to modify it. +To customize the path: -If the CI configuration will stay within the repository, but in a -location different than the default, -the path must be relative to the root directory. Examples of valid paths and file names: +1. Go to the project's **Settings > CI / CD**. +1. Expand the **General pipelines** section. +1. Provide a value in the **Custom CI configuration path** field. +1. Click **Save changes**. + +If the CI configuration is stored within the repository in a non-default +location, the path must be relative to the root directory. Examples of valid +paths and file names include: - `.gitlab-ci.yml` (default) - `.my-custom-file.yml` - `my/path/.gitlab-ci.yml` - `my/path/.my-custom-file.yml` +If the CI configuration will be hosted on an external site, the URL link must end with `.yml`: + +- `http://example.com/generate/ci/config.yml` + If the CI configuration will be hosted in a different project within GitLab, the path must be relative to the root directory in the other project, with the group and project name added to the end: - `.gitlab-ci.yml@mygroup/another-project` - `my/path/.my-custom-file.yml@mygroup/another-project` -If the CI configuration will be hosted on an external site, different than the GitLab instance, -the URL link must end with `.yml`: - -- `http://example.com/generate/ci/config.yml` +Hosting the configuration file in a separate project allows stricter control of the +configuration file. For example: -The path can be customized at a project level. To customize the path: +- Create a public project to host the configuration file. +- Give write permissions on the project only to users who are allowed to edit the file. -1. Go to the project's **Settings > CI / CD**. -1. Expand the **General pipelines** section. -1. Provide a value in the **Custom CI configuration path** field. -1. Click **Save changes**. +Other users and projects will be able to access the configuration file without being +able to edit it. ## Test coverage parsing diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md index 8756760fe4b..4cf0e458a53 100644 --- a/doc/user/project/repository/forking_workflow.md +++ b/doc/user/project/repository/forking_workflow.md @@ -37,6 +37,10 @@ After the forking is done, you can start working on the newly created repository. There, you will have full [Owner](../../permissions.md) access, so you can set it up as you please. +CAUTION: **CAUTION:** +From GitLab 12.6 onwards, if the [visibility of an upstream project is reduced](../../../public_access/public_access.md#reducing-visibility) +in any way, the fork relationship with all its forks will be removed. + ## Merging upstream Once you are ready to send your code back to the main project, you need -- cgit v1.2.1