From 3a9c427a313a51298691324a4157cb493569a96b Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Tue, 19 Jul 2016 04:11:39 +0000 Subject: [PATCH 1/5] add short description and use-cases --- doc/user/project/file_lock.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 394b359ac8b274..ebe49695ed6db4 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -1,3 +1,14 @@ +## What is File Lock about? + +With this feature you can lock files to prevent modification. + +## Use-cases (examples) + +- Avoid conflicts when modifying game assets +- Prevent design assets from being overwritten + +---- + # File Lock >**Note:** -- GitLab From fbe9925ae08e9bdedf6dce054124506dc3260dc2 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Tue, 19 Jul 2016 04:14:22 +0000 Subject: [PATCH 2/5] add hr after ToC, before H2 --- doc/user/project/file_lock.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index ebe49695ed6db4..663e18e9ed619f 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -1,3 +1,5 @@ +--- + ## What is File Lock about? With this feature you can lock files to prevent modification. @@ -7,7 +9,7 @@ With this feature you can lock files to prevent modification. - Avoid conflicts when modifying game assets - Prevent design assets from being overwritten ----- +--- # File Lock -- GitLab From d0fa4da3aea5f3c5017e8318ed6b72d51271f4d2 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 21 Jul 2016 04:38:06 +0000 Subject: [PATCH 3/5] remove 'examples', add use-case --- doc/user/project/file_lock.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 663e18e9ed619f..17261074d58619 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -1,15 +1,16 @@ ---- +---- ## What is File Lock about? With this feature you can lock files to prevent modification. -## Use-cases (examples) +## Use-cases - Avoid conflicts when modifying game assets - Prevent design assets from being overwritten +- Avoid merge conflicts ---- +---- # File Lock -- GitLab From 4f5f3346c35ba175d06fe563a9fd9bfe26574a66 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 18 Aug 2016 03:16:07 +0000 Subject: [PATCH 4/5] adjustments based on https://gitlab.com/gitlab-com/marketing/issues/336#note_13718538 --- doc/user/project/file_lock.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 17261074d58619..3bb3d93758ffdc 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -1,16 +1,3 @@ ----- - -## What is File Lock about? - -With this feature you can lock files to prevent modification. - -## Use-cases - -- Avoid conflicts when modifying game assets -- Prevent design assets from being overwritten -- Avoid merge conflicts - ----- # File Lock @@ -24,6 +11,18 @@ This feature needs to have a license with the "File Lock" option enabled. If you are using Enterprise Edition but you don't see the "Lock" button, ask your GitLab administrator. Check GitLab's [pricing page] for more information. +## Overview + +With this feature you can lock files to prevent modification. + +## Use-cases + +- Avoid conflicts when modifying game assets +- Prevent design assets from being overwritten +- Avoid merge conflicts + +## Description + GitLab gives you the ability to lock any file or directory in the repository tree reserving you the right to make changes to that file or directory. **Locking only works for the default branch you have set in the project's settings** (usually -- GitLab From 1880c213b431cb9b5c46a296e2fe92846d59c47e Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 18 Aug 2016 05:47:12 +0000 Subject: [PATCH 5/5] Update file_lock.md - trying to make the build pass --- doc/user/project/file_lock.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 3bb3d93758ffdc..ee0847d951ace8 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -1,4 +1,3 @@ - # File Lock >**Note:** @@ -11,6 +10,8 @@ This feature needs to have a license with the "File Lock" option enabled. If you are using Enterprise Edition but you don't see the "Lock" button, ask your GitLab administrator. Check GitLab's [pricing page] for more information. +--- + ## Overview With this feature you can lock files to prevent modification. -- GitLab