diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-05 17:51:38 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-05 17:51:38 +0000 |
| commit | b81535351023a3b19870ce052d8c3d0563391686 (patch) | |
| tree | 0332d42df3b6fb80e752b47121f6a0f4ddb0cf92 /app/controllers | |
| parent | c9b246334753c47bef1111bdbfc1a45a1c9b0cfe (diff) | |
| parent | e5a7ed3ac36aaa1045353e589dae98a29ca72f1e (diff) | |
| download | gitlab-ce-b81535351023a3b19870ce052d8c3d0563391686.tar.gz | |
Merge branch 'add-sentry-js-again-with-vue' into 'master'
Add sentry JS
See merge request !6764
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 643993d035e..152d7baad49 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -133,6 +133,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :signup_enabled, :sentry_dsn, :sentry_enabled, + :clientside_sentry_dsn, + :clientside_sentry_enabled, :send_user_confirmation_email, :shared_runners_enabled, :shared_runners_text, |