summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-03-25 09:11:08 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-03-25 09:11:08 +0000
commit63c8a05bf7f18ac4093ece1f08b4b5fd8dba5fac (patch)
tree2e223bba4a8084ce741608de12252de8da8c245c
parent28c94ee955888c48547c02f5d60698faa7aa7b58 (diff)
parent2da8204ff5444016861f5270af4bf58673e4370f (diff)
downloadgitlab-ce-63c8a05bf7f18ac4093ece1f08b4b5fd8dba5fac.tar.gz
Merge branch 'clarify_lfs' into 'master'
Clarify LFS configuration A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default. See merge request !3388
-rw-r--r--doc/workflow/lfs/lfs_administration.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/workflow/lfs/lfs_administration.md b/doc/workflow/lfs/lfs_administration.md
index 36cb9da2380..9dc1e9b47e3 100644
--- a/doc/workflow/lfs/lfs_administration.md
+++ b/doc/workflow/lfs/lfs_administration.md
@@ -23,6 +23,10 @@ In `/etc/gitlab/gitlab.rb`:
```ruby
gitlab_rails['lfs_enabled'] = false
+
+# Optionally, change the storage path location. Defaults to
+# `#{gitlab_rails['shared_path']}/lfs-objects`. Which evaluates to
+# `/var/opt/gitlab/gitlab-rails/shared/lfs-objects` by default.
gitlab_rails['lfs_storage_path'] = "/mnt/storage/lfs-objects"
```