summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-02-20 12:53:51 +0000
committerIan Baum <ibaum@gitlab.com>2018-02-23 13:57:57 -0600
commitbcb4273ec03b5d2e8e1e4d6ff778b51c7cd52994 (patch)
treeb5cbcb9209be0ca2f4a1db384dde4c9e3e1cc356
parent8491e92c60e9808174af5d88f007de1ab0be510c (diff)
downloadgitlab-ce-bcb4273ec03b5d2e8e1e4d6ff778b51c7cd52994.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: