From 29c5b31c192925e2a73e789ab6904168801ab260 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 13 Mar 2017 22:16:29 -0700
Subject: [PATCH] Remove unused satellites config

Note that the old migrations depend on 1_settings.rb, so we can't
quite remove those completely.
---
 config/gitlab.yml.example | 10 ----------
 1 file changed, 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: