Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/sh-fix-oauth2-callback-caps.yml

+---
+title: Downcase aliased OAuth2 callback providers
+merge_request: 24877
+author:
+type: fixed

config/routes/import.rb

 # Alias import callbacks under the /users/auth endpoint so that
 # the OAuth2 callback URL can be restricted under http://example.com/users/auth
 # instead of http://example.com.
-Devise.omniauth_providers.each do |provider|
+Devise.omniauth_providers.map(&:downcase).each do |provider|
   next if provider == 'ldapmain'
 
   get "/users/auth/-/import/#{provider}/callback", to: "import/#{provider}#callback", as: "users_import_#{provider}_callback"

scripts/review_apps/review-apps.sh

@@ -143,11 +143,16 @@ HELM_CMD=$(cat << EOF
     --set global.hosts.hostSuffix="$HOST_SUFFIX" \
     --set global.hosts.domain="$REVIEW_APPS_DOMAIN" \
     --set certmanager.install=false \
+    --set prometheus.install=false \
     --set global.ingress.configureCertmanager=false \
     --set global.ingress.tls.secretName=tls-cert \
     --set global.ingress.annotations."external-dns\.alpha\.kubernetes\.io/ttl"="10"
+    --set nginx-ingress.defaultBackend.resources.requests.memory=7Mi \
+    --set nginx-ingress.controller.resources.requests.memory=440M \
+    --set nginx-ingress.controller.replicaCount=2 \
     --set gitlab.unicorn.resources.requests.cpu=200m \
     --set gitlab.sidekiq.resources.requests.cpu=100m \
+    --set gitlab.sidekiq.resources.requests.memory=800M \
     --set gitlab.gitlab-shell.resources.requests.cpu=100m \
     --set redis.resources.requests.cpu=100m \
     --set minio.resources.requests.cpu=100m \