diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-05 21:48:31 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-05 21:48:31 +0300 |
commit | 40e3d11b397bfd03637e39b61daafde2919da3f3 (patch) | |
tree | a15ad55aa0fe78d7da704b954f113ec1f155cef9 /doc/user | |
parent | 69e83da91a4de0a1ae361c05a5955846e9663b9f (diff) | |
parent | 157b4e0dfa8dd6d79f5b844807c6a8d0aec41db9 (diff) |
Merge branch 'docs-fix-note-and-links' into 'master'
Docs: Fixes note, inline links
See merge request gitlab-org/gitlab-ce!29065
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/file_lock.md | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 541023692ea..3386eb9d0d4 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -1,10 +1,8 @@ # File Locking **[PREMIUM]** -> **Notes:** -> - [Introduced][ee-440] in [GitLab Premium][ee] 8.9. -> - This feature needs to have a license with the "File Lock" option enabled. If -> you are using Premium but you don't see the "Lock" button, -> ask your GitLab administrator. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440) in [GitLab Premium](https://about.gitlab.com/pricing/) 8.9. +> - This feature needs to have a license with the "File Lock" option enabled. +> - If you are using Premium but you don't see the "Lock" button, ask your GitLab administrator. File Locking helps you avoid merge conflicts and better manage your binary files. Lock any file or directory, make your changes, and then unlock it so another @@ -37,7 +35,7 @@ lies under them is also locked. The user that locks a file or directory **is the only one** that can edit and push their changes back to the repository where the locked objects are located. -Locks can be created by any person who has [push access] to the repository; i.e., +Locks can be created by any person who has [push access](../../user/permissions.md) to the repository; i.e., Developer and higher level, and can be removed solely by their author and any user with Maintainer permissions and above. @@ -101,7 +99,3 @@ To view or manage every existing lock, navigate to the locks and [remove the ones you have permission for](#permissions-on-file-locking). ![Locked Files](img/file_lock_list.png) - -[ee-440]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440 "File Lock" -[ee]: https://about.gitlab.com/pricing/ -[push access]: ../../user/permissions.md |