diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 17:21:27 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 17:21:27 +0100 |
| commit | dac3b6a4164c77bb142ec1644ed7c697c5c69459 (patch) | |
| tree | 084211a58c311f358579be4f0daee8eb323ec4ac | |
| parent | 944ed8da556a067746ac6e98e2e81781748eab48 (diff) | |
| download | gitlab-ce-dac3b6a4164c77bb142ec1644ed7c697c5c69459.tar.gz | |
Review changes, removed api/v3 updates as its frozen, removed the clientside_sentry properties from the sensitive data filter as they\'re both available publically
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | lib/api/v3/settings.rb | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/config/application.rb b/config/application.rb index 46652637c1f..f2ecc4ce77c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,7 +55,6 @@ module Gitlab # - Webhook URLs (:hook) # - GitLab-shell secret token (:secret_token) # - Sentry DSN (:sentry_dsn) - # - Clientside Sentry DSN (:clientside_sentry_dsn) # - Deploy keys (:key) config.filter_parameters += %i( authentication_token @@ -72,8 +71,6 @@ module Gitlab runners_token secret_token sentry_dsn - clientside_sentry_enabled - clientside_sentry_dsn variables ) diff --git a/lib/api/v3/settings.rb b/lib/api/v3/settings.rb index 67a85e13d8c..aa31f01b62c 100644 --- a/lib/api/v3/settings.rb +++ b/lib/api/v3/settings.rb @@ -89,10 +89,6 @@ module API given sentry_enabled: ->(val) { val } do requires :sentry_dsn, type: String, desc: 'Sentry Data Source Name' end - optional :clientside_sentry_enabled, type: Boolean, desc: 'Sentry can also be used for reporting and logging clientside exceptions. https://sentry.io/for/javascript/' - given clientside_sentry_enabled: ->(val) { val } do - requires :clientside_sentry_dsn, type: String, desc: 'Clientside Sentry Data Source Name' - end optional :repository_storage, type: String, desc: 'Storage paths for new projects' optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues." optional :koding_enabled, type: Boolean, desc: 'Enable Koding' |