summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-11 14:12:25 +0000
committerNick Thomas <nick@gitlab.com>2019-06-11 14:12:25 +0000
commitd18543c7e3b850001a5b72822864c6d68ba17fbe (patch)
treed69114f51037b63be3fe838f4400da208d705473
parent58c981045ce126d23ed0f50616fbfb9b795f62b4 (diff)
parent792b31884dd3282a20537d65167e70c6f3cf2c8d (diff)
downloadgitlab-shell-d18543c7e3b850001a5b72822864c6d68ba17fbe.tar.gz
Merge branch 'id-enable-features-by-default' into 'master'
Enable all migration features by default See merge request gitlab-org/gitlab-shell!313
-rw-r--r--config.yml.example4
1 files changed, 1 insertions, 3 deletions
diff --git a/config.yml.example b/config.yml.example
index 4c356a7..a03c22a 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -53,9 +53,7 @@ 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: []
+# migration: { enabled: true, features: ['discover', '2fa_recovery_codes', 'git-receive-pack', 'git-upload-pack', 'git-upload-archive', 'git-lfs-authenticate'] }
# Distributed Tracing. GitLab-Shell has distributed tracing instrumentation.
# For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html