Commit 9985c367 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'docs/lfs-lock' into 'master'

Add version which LFS lock was introduced

See merge request gitlab-org/gitlab-ce!17233
parents 5048c8d5 fff70a04
...@@ -34,7 +34,7 @@ Documentation for GitLab instance administrators is under [LFS administration do ...@@ -34,7 +34,7 @@ Documentation for GitLab instance administrators is under [LFS administration do
credentials store is recommended credentials store is recommended
* Git LFS always assumes HTTPS so if you have GitLab server on HTTP you will have * 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)) 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 >**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 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. to the Git LFS client, so no action is required by the user.
...@@ -85,6 +85,8 @@ git lfs fetch master ...@@ -85,6 +85,8 @@ git lfs fetch master
## File Locking ## 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 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 kind of files are lockable. The following command will store PNG files
in LFS and flag them as lockable: in LFS and flag them as lockable:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment