summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-31 12:08:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-31 12:08:55 +0000
commitea1dcaef18edf97b3ac73892d64ebaf5eecd7f68 (patch)
tree4ffca65c5590a6bb6ea6f72efda3feaf7be45ec2 /scripts
parent2c6c1c4dce92b5ef64c357156c9a27656e8bdbb8 (diff)
downloadgitlab-ce-ea1dcaef18edf97b3ac73892d64ebaf5eecd7f68.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r--scripts/review_apps/base-config.yaml6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml
index 5b4b557c305..01a94fcee21 100644
--- a/scripts/review_apps/base-config.yaml
+++ b/scripts/review_apps/base-config.yaml
@@ -136,11 +136,9 @@ postgresql:
metrics:
enabled: false
resources:
- requests:
- cpu: 550m
+ cpu: 600m
memory: 1000M
- limits:
- cpu: 825m
+ cpu: 1300m
memory: 1500M
prometheus:
install: false