diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-03-14 08:16:29 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-03-14 08:16:29 +0300 |
| commit | 29c5b31c192925e2a73e789ab6904168801ab260 (patch) | |
| tree | e8f08c2dfda3df0a9c4b116bd672231901256c06 /config | |
| parent | d3024ee17b10ceac3ba33eca15c4d967763276ec (diff) | |
Remove unused satellites config
Note that the old migrations depend on 1_settings.rb, so we can't
quite remove those completely.
Diffstat (limited to 'config')
| -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: |