Merge branch 'security-fix-es-credentials-leak' into 'master'

Prevent ES credentials leak Closes #111 See merge request gitlab-org/security/gitlab!413

Merge branch 'security-fix-es-credentials-leak' into 'master'
Prevent ES credentials leak Closes #111 See merge request gitlab-org/security/gitlab!413
797f6e8c · GitLab Release Tools Bot · 75d99ce3 · 312d1f37 · 797f6e8c · 797f6e8c
Commit 797f6e8c authored Apr 27, 2020 by GitLab Release Tools Bot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

changelogs/unreleased/security-fix-es-credentials-leak.yml changelogs/unreleased/security-fix-es-credentials-leak.yml +5 -0

config/application.rb config/application.rb +1 -0

No files found.
--- a/changelogs/unreleased/security-fix-es-credentials-leak.yml
+++ b/changelogs/unreleased/security-fix-es-credentials-leak.yml
+---
+title: Prevent ES credentials leak
+merge_request:
+author:
+type: security
--- a/config/application.rb
+++ b/config/application.rb
@@ -131,6 +131,7 @@ module Gitlab
      encrypted_key
      hook
      import_url
+      elasticsearch_url
      otp_attempt
      sentry_dsn
      trace