From b9fe665d2539f53fb86771383e18f9045db52414 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 14 Mar 2022 19:45:29 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-8-stable-ee --- doc/user/project/description_templates.md | 10 ++++++---- doc/user/project/settings/index.md | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'doc/user/project') diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md index 539f5230063..4f8cfad1444 100644 --- a/doc/user/project/description_templates.md +++ b/doc/user/project/description_templates.md @@ -129,8 +129,9 @@ Prerequisites: To set a default description template for merge requests, either: -- [Create a merge request template](#create-a-merge-request-template) named `Default.md` and save it in `.gitlab/merge_request_templates/`. - This will not overwrite the default template if one has been set in the project settings. +- [Create a merge request template](#create-a-merge-request-template) named `Default.md` or `default.md` + and save it in `.gitlab/merge_request_templates/`. + This doesn't overwrite the default template if one has been set in the project settings. - Users on GitLab Premium and higher: set the default template in project settings: 1. On the top bar, select **Menu > Projects** and find your project. @@ -141,8 +142,9 @@ To set a default description template for merge requests, either: To set a default description template for issues, either: -- [Create an issue template](#create-an-issue-template) named `Default.md` and save it in `.gitlab/issue_templates/`. - This will not overwrite the default template if one has been set in the project settings. +- [Create an issue template](#create-an-issue-template) named `Default.md` or `default.md` + and save it in `.gitlab/issue_templates/`. + This doesn't overwrite the default template if one has been set in the project settings. - Users on GitLab Premium and higher: set the default template in project settings: 1. On the top bar, select **Menu > Projects** and find your project. diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 4c6be3511f2..12d75551aac 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -217,7 +217,11 @@ cannot change them: This ensures that your job uses the settings you intend and that they are not overridden by project-level pipelines. -##### Avoid parent and child pipelines +##### Avoid parent and child pipelines in GitLab 14.7 and earlier + +NOTE: +This advice does not apply to GitLab 14.8 and later because [a fix](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78878) added +compatibility for combining compliance pipelines, and parent and child pipelines. Compliance pipelines start on the run of _every_ pipeline in a relevant project. This means that if a pipeline in the relevant project triggers a child pipeline, the compliance pipeline runs first. This can trigger the parent pipeline, instead of the child pipeline. -- cgit v1.2.3