diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 12:07:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 12:07:55 +0000 |
| commit | 5e11c9b77cb1b2b77ee29359047b55807afe255d (patch) | |
| tree | 40b02dead6acdcaab9cc15efc9ae4710c2ed78a8 /scripts/review_apps | |
| parent | 97d4d926630822d0e1a638206909679c962d2f0a (diff) | |
| download | gitlab-ce-5e11c9b77cb1b2b77ee29359047b55807afe255d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps')
| -rw-r--r-- | scripts/review_apps/base-config.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index 1014bd9a89f..8465f32b741 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -8,6 +8,8 @@ global: configureCertmanager: false tls: secretName: tls-cert + initialRootPassword: + secret: shared-gitlab-initial-root-password certmanager: install: false gitlab: @@ -26,8 +28,6 @@ gitlab: mailroom: enabled: false migrations: - initialRootPassword: - secret: shared-gitlab-initial-root-password resources: requests: cpu: 350m |