Merge branch 'remove-satellites' into 'master'
Remove unused satellites config See merge request !9919
This commit is contained in:
commit
52ebaef3d3
|
@ -456,14 +456,6 @@ production: &base
|
||||||
# 4. Advanced settings
|
# 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 settings
|
||||||
repositories:
|
repositories:
|
||||||
# Paths where repositories can be stored. Give the canonicalized absolute pathname.
|
# 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
|
# In order to setup it correctly you need to specify
|
||||||
# your system username you use to run GitLab
|
# your system username you use to run GitLab
|
||||||
# user: YOUR_USERNAME
|
# user: YOUR_USERNAME
|
||||||
satellites:
|
|
||||||
path: tmp/tests/gitlab-satellites/
|
|
||||||
repositories:
|
repositories:
|
||||||
storages:
|
storages:
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue