summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-10-23 16:51:44 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-10-23 17:39:22 +0200
commit122f02bc39c690b7fef69f57075380ca82c25b46 (patch)
treef94c5e3ab7a3d3fbd61310a4ae6b69c20e31b6e7 /config/gitlab.yml.example
parent0bb50ea081e6817e6d67c4f1dbe08f3d2fd720e1 (diff)
downloadgitlab-ce-122f02bc39c690b7fef69f57075380ca82c25b46.tar.gz
Remove the contents of the satellites dirremove-satellites
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 8b85981497a..d3aef44705b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -318,10 +318,12 @@ production: &base
# ==========================
# GitLab Satellites
+ #
+ # Note for maintainers: keep the satellites.path setting until GitLab 9.0 at
+ # least. This setting is fed to 'rm -rf' in
+ # db/migrate/20151023144219_remove_satellites.rb
satellites:
- # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/git/gitlab-satellites/
- timeout: 30
## Backup settings
backup: