summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-02 12:27:57 +0000
committerRémy Coutable <remy@rymai.me>2016-11-02 12:27:57 +0000
commit1537b1d300c26e7d5c14f05caa2857481b8f7dec (patch)
tree191c8b2f481b5e56ae5d3561361c4b89635b945c
parente0c9c655bb68c09dbc266e3153faf6f2e0db603e (diff)
parentafc465d9ecce58df92b436d2ebf9732147e9a0cb (diff)
downloadgitlab-ce-1537b1d300c26e7d5c14f05caa2857481b8f7dec.tar.gz
Merge branch 'patch-8' into 'master'
Explains the problem instead of Yelling. The relevant part that fails is in gitlab-shell: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.6/hooks/post-receive#L8 See merge request !7224
-rw-r--r--config/gitlab.yml.example4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 3451b68cea5..699ab6075b6 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -432,7 +432,9 @@ production: &base
## Repositories settings
repositories:
# Paths where repositories can be stored. Give the canonicalized absolute pathname.
- # NOTE: REPOS PATHS MUST NOT CONTAIN ANY SYMLINK!!!
+ # IMPORTANT: None of the path components may be symlink, because
+ # gitlab-shell invokes Dir.pwd inside the repository path and that results
+ # real path not the symlink.
storages: # You must have at least a `default` storage path.
default: /home/git/repositories/