diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-26 18:24:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-26 18:24:14 +0000 |
| commit | 8c28c3e84eb3e330f10bf2c765668a23dfce5080 (patch) | |
| tree | f48f0f99308bd9c6c81b7d318d79a72d1776f232 /app/helpers | |
| parent | 2b00b61eba758baf9d4242ba9c71f2319f8ec428 (diff) | |
| parent | cd8aaea36f3c2b69c7c48c00ed56de14267969dd (diff) | |
| download | gitlab-ce-8c28c3e84eb3e330f10bf2c765668a23dfce5080.tar.gz | |
Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'
Remove Sentry settings from application settings
See merge request gitlab-org/gitlab-ce!28447
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index d837c42fd68..aaaa954047f 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -165,8 +165,6 @@ module ApplicationSettingsHelper :authorized_keys_enabled, :auto_devops_enabled, :auto_devops_domain, - :clientside_sentry_dsn, - :clientside_sentry_enabled, :container_registry_token_expire_delay, :default_artifacts_expire_in, :default_branch_protection, @@ -235,8 +233,6 @@ module ApplicationSettingsHelper :restricted_visibility_levels, :rsa_key_restriction, :send_user_confirmation_email, - :sentry_dsn, - :sentry_enabled, :session_expire_delay, :shared_runners_enabled, :shared_runners_text, |