diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/controllers/concerns/service_params.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/controllers/concerns/service_params.rb')
-rw-r--r-- | app/controllers/concerns/service_params.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb index e2c83f9a069..e78fa8f8250 100644 --- a/app/controllers/concerns/service_params.rb +++ b/app/controllers/concerns/service_params.rb @@ -6,6 +6,7 @@ module ServiceParams ALLOWED_PARAMS_CE = [ :active, :add_pusher, + :alert_events, :api_key, :api_url, :api_version, @@ -28,6 +29,8 @@ module ServiceParams :drone_url, :enable_ssl_verification, :external_wiki_url, + :google_iap_service_account_json, + :google_iap_audience_client_id, # We're using `issues_events` and `merge_requests_events` # in the view so we still need to explicitly state them # here. `Service#event_names` would only give |