diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 21:32:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 21:32:44 +0300 |
| commit | 004d0ef00672e8445682235c4ef74fd9475bea24 (patch) | |
| tree | b1c20c40e8e6516091c7cf5d564a7aa4e2a2a247 /app/models | |
| parent | 0c738dd9b13c6276975e25440d03d4db660adcb1 (diff) | |
Add latest changes from gitlab-org/security/gitlab@15-9-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/integration.rb | 2 | ||||
| -rw-r--r-- | app/models/integrations/datadog.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/integration.rb b/app/models/integration.rb index 8bef8b08c19..d3006f00ba1 100644 --- a/app/models/integration.rb +++ b/app/models/integration.rb @@ -510,7 +510,7 @@ class Integration < ApplicationRecord end def api_field_names - fields.reject { _1[:type] == 'password' }.pluck(:name) + fields.reject { _1[:type] == 'password' || _1[:name] == 'webhook' }.pluck(:name) end def form_fields diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb index 80eecc14d0f..3b3c7d8f2cd 100644 --- a/app/models/integrations/datadog.rb +++ b/app/models/integrations/datadog.rb @@ -15,6 +15,7 @@ module Integrations TAG_KEY_VALUE_RE = %r{\A [\w-]+ : .*\S.* \z}x.freeze field :datadog_site, + exposes_secrets: true, placeholder: DEFAULT_DOMAIN, help: -> do ERB::Util.html_escape( |