diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-30 21:27:27 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-30 21:27:27 +0300 |
| commit | 29c5174274feafebc4ecb182eaece3dfb2197d22 (patch) | |
| tree | e1632a18a93076b6cad8f92b1258579ff6e93e8f /app/views | |
| parent | 93a332a620f54038d78bd82ce6f1f553d92b7f46 (diff) | |
| parent | aebb2f70257882dd530b820f3cfdd67621d2a3fd (diff) | |
Merge branch 'feat/sentry-environment' into 'master'
feat: add option to define the Sentry Environment
See merge request gitlab-org/gitlab-ce!27091
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_logging.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml index 41b787515b5..4145ef94de8 100644 --- a/app/views/admin/application_settings/_logging.html.haml +++ b/app/views/admin/application_settings/_logging.html.haml @@ -1,6 +1,13 @@ = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-logging-settings'), html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) + %p + %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 anb 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 .form-group .form-check |