Automatic merge of gitlab-org/gitlab-ce master

app/validators/url_validator.rb

@@ -93,6 +93,12 @@ class UrlValidator < ActiveModel::EachValidator
   end
 
   def allow_setting_local_requests?
+    # We cannot use Gitlab::CurrentSettings as ApplicationSetting itself
+    # uses UrlValidator to validate urls. This ends up in a cycle
+    # when Gitlab::CurrentSettings creates an ApplicationSetting which then
+    # calls this validator.
+    #
+    # See https://gitlab.com/gitlab-org/gitlab-ee/issues/9833
     ApplicationSetting.current&.allow_local_requests_from_hooks_and_services?
   end
 end

changelogs/unreleased/helm-2-12-3.yml

+---
+title: Bump Helm and kubectl in Auto DevOps to 2.12.3 and 1.11.7 respectively
+merge_request: 25072
+author:
+type: other

lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml

@@ -49,8 +49,8 @@ variables:
   POSTGRES_ENABLED: "true"
   POSTGRES_DB: $CI_ENVIRONMENT_SLUG
 
-  KUBERNETES_VERSION: 1.11.6
-  HELM_VERSION: 2.12.2
+  KUBERNETES_VERSION: 1.11.7
+  HELM_VERSION: 2.12.3
 
   DOCKER_DRIVER: overlay2