diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-29 00:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-29 00:09:37 +0300 |
| commit | 7ee1ce8d781f506180501c5eb07d1dfcfb8b2c6a (patch) | |
| tree | b400451d326d69bfa53af7a0557e66b91bd978cc /app/helpers/application_settings_helper.rb | |
| parent | bde0c40776f2152496c37239afe987f13d486314 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 9a43a4a3a15..67cfed0b015 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -254,6 +254,8 @@ module ApplicationSettingsHelper :password_authentication_enabled_for_git, :performance_bar_allowed_group_path, :performance_bar_enabled, + :kroki_enabled, + :kroki_url, :plantuml_enabled, :plantuml_url, :polling_interval_multiplier, |