[tor-commits] [dip/master] Import gitlab-shell config changes

[hiro at torproject.org]

commit 0b4ad3f5097de40297b96b9bc7d194ca9643e015
Author: Bastian Blank <waldi at debian.org>
Date:   Mon Dec 23 09:54:35 2019 +0100

    Import gitlab-shell config changes
---
 roles/gitlab-shell/templates/gitlab-shell.config.yml.j2 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/roles/gitlab-shell/templates/gitlab-shell.config.yml.j2 b/roles/gitlab-shell/templates/gitlab-shell.config.yml.j2
index 76ffeee..7903eff 100644
--- a/roles/gitlab-shell/templates/gitlab-shell.config.yml.j2
+++ b/roles/gitlab-shell/templates/gitlab-shell.config.yml.j2
@@ -50,13 +50,6 @@ log_format: json
 # incurs an extra API call on every gitlab-shell command.
 audit_usernames: false
 
-# Migration to Go: anything listed here has two implementations. Use these flags
-# to try the new implementations out, or to revert to the old behaviour if there
-# problems arise.
-migration:
-  enabled: false
-  features: []
-
 # Distributed Tracing. GitLab-Shell has distributed tracing instrumentation.
 # For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html 
 # gitlab_tracing: opentracing://driver