diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-14 17:53:50 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-14 17:53:50 +0000 |
| commit | 52ebaef3d3fc4726604259b8ef1e0d592eff148f (patch) | |
| tree | 33bae2fd73faba204a8632ddc15943b2f7fe6238 | |
| parent | ef32f4c3571318c8fc40fc624d8a218aaf6b244d (diff) | |
| parent | 29c5b31c192925e2a73e789ab6904168801ab260 (diff) | |
| download | gitlab-ce-52ebaef3d3fc4726604259b8ef1e0d592eff148f.tar.gz | |
Merge branch 'remove-satellites' into 'master'
Remove unused satellites config
See merge request !9919
| -rw-r--r-- | config/gitlab.yml.example | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 2bc39ea3f65..954809a882c 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -456,14 +456,6 @@ production: &base # 4. Advanced settings # ========================== - # 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: - path: /home/git/gitlab-satellites/ - ## Repositories settings repositories: # Paths where repositories can be stored. Give the canonicalized absolute pathname. @@ -581,8 +573,6 @@ test: # In order to setup it correctly you need to specify # your system username you use to run GitLab # user: YOUR_USERNAME - satellites: - path: tmp/tests/gitlab-satellites/ repositories: storages: default: |