summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-02-20 12:53:51 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2018-02-20 12:53:51 +0000
commit9985c3677d7f96bc264d2b392df47b0ab2d7839b (patch)
tree27d0ff2e509333c6403c1fb05b694ed9e881f998
parent5048c8d5050cd432381d845997c5e7991e6590f1 (diff)
parentfff70a04e1444d108ce02c0370ee85a0ecb07817 (diff)
downloadgitlab-ce-9985c3677d7f96bc264d2b392df47b0ab2d7839b.tar.gz
Merge branch 'docs/lfs-lock' into 'master'
Add version which LFS lock was introduced See merge request gitlab-org/gitlab-ce!17233
-rw-r--r--doc/workflow/lfs/manage_large_binaries_with_git_lfs.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index 8fff3d591fe..377eee69c11 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -34,7 +34,7 @@ Documentation for GitLab instance administrators is under [LFS administration do
credentials store is recommended
* Git LFS always assumes HTTPS so if you have GitLab server on HTTP you will have
to add the URL to Git config manually (see [troubleshooting](#troubleshooting))
-
+
>**Note**: With 8.12 GitLab added LFS support to SSH. The Git LFS communication
still goes over HTTP, but now the SSH client passes the correct credentials
to the Git LFS client, so no action is required by the user.
@@ -85,6 +85,8 @@ git lfs fetch master
## File Locking
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35856) in GitLab 10.5.
+
The first thing to do before using File Locking is to tell Git LFS which
kind of files are lockable. The following command will store PNG files
in LFS and flag them as lockable: