diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-01 21:23:11 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-01 21:23:11 +0300 |
| commit | 6627efd6b48e70a572149865bd4196e6f711f9de (patch) | |
| tree | b8fa7e862fe83405772bdbef10413a0c5dd44aaf /app | |
| parent | 43648e5ed9c23e5e34bd67255aac329b32b3e925 (diff) | |
Allow Sentry client-side DSN to be passed on gitlab.yml
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_logging.html.haml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 557215ff4dc..ee12a1d09f3 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -196,7 +196,7 @@ module ApplicationSettingImplementation end def clientside_sentry_dsn - Gitlab.config.sentry.dsn || read_attribute(:clientside_sentry_dsn) + Gitlab.config.sentry.clientside_dsn || read_attribute(:clientside_sentry_dsn) end def performance_bar_allowed_group diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml index 006ebf09576..1da5f6fccd6 100644 --- a/app/views/admin/application_settings/_logging.html.haml +++ b/app/views/admin/application_settings/_logging.html.haml @@ -5,7 +5,6 @@ %strong NOTE: These settings will be removed from the UI in a GitLab 12.0 release and made available within gitlab.yml. - The specific client side DSN setting is already handled as a component from a Sentry perspective and will be removed. In addition, you will be able to define a Sentry Environment to differentiate between multiple deployments. For example, development, staging, and production. %fieldset |