summaryrefslogtreecommitdiff
path: root/scripts/review_apps/base-config.yaml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 12:06:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 12:06:30 +0000
commit3269a20692c5b1f32862072d7897a4e753bae9ef (patch)
tree9dfc6e7ccb857b323dc8b12259d339b76b8b90bf /scripts/review_apps/base-config.yaml
parentc02f53288a838166a28518983fae3b80ca5936d8 (diff)
downloadgitlab-ce-3269a20692c5b1f32862072d7897a4e753bae9ef.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps/base-config.yaml')
-rw-r--r--scripts/review_apps/base-config.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml
index 7aaa7544c19..407014858b4 100644
--- a/scripts/review_apps/base-config.yaml
+++ b/scripts/review_apps/base-config.yaml
@@ -26,6 +26,8 @@ gitlab:
mailroom:
enabled: false
migrations:
+ initialRootPassword:
+ secret: shared-gitlab-initial-root-password
resources:
requests:
cpu: 350m