diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 21:10:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 21:10:33 +0300 |
| commit | 1cb90c3b4f04d42fa30f7903b10b32721c5fadac (patch) | |
| tree | 7fcc5031b249c936a73dfbd4fe2594b1e0a2943d /doc/user/project/file_lock.md | |
| parent | e45c8a7e74d4c1a1f7e12504df3611f797620166 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/file_lock.md')
| -rw-r--r-- | doc/user/project/file_lock.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 576de63d00d..4c93947d5a0 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -201,8 +201,8 @@ This process allows you to lock one file at a time through the GitLab UI and 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`). +Default branch file and directory locks only apply to the +[default branch](repository/branches/default.md) set in the project's settings. Changes to locked files on the default branch are blocked, including merge requests that modify locked files. Unlock the file to allow changes. |