From 5fe1957d2bd0c3f969f357b17f4b46f1968d8810 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 29 Jan 2021 00:09:17 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/project/file_lock.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/user/project/file_lock.md') diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 22345824e35..2822d369d8a 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -198,7 +198,8 @@ Suggested workflow for shared projects: > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/440) in GitLab Enterprise Edition 8.9. Available in [GitLab Premium](https://about.gitlab.com/pricing/). This process allows you to lock one file at a time through the GitLab UI and -requires access to [GitLab Premium, GitLab.com Silver](https://about.gitlab.com/pricing/), or higher tiers. +requires access to [GitLab Premium](https://about.gitlab.com/pricing/) +or higher tiers. Default branch file and directory locks only apply to the default branch set in the project's settings (usually `master`). -- cgit v1.2.3