diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 03:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 03:08:59 +0000 |
| commit | 38c3d3255398d615cf93867cb82902c3d2cb65a5 (patch) | |
| tree | 5cc74f663afedac5125a59f81e2a4a571c61cb49 /app/controllers/admin/application_settings_controller.rb | |
| parent | 668e319631855d6d9396a203ded1fa5bcb986f1f (diff) | |
| download | gitlab-ce-38c3d3255398d615cf93867cb82902c3d2cb65a5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index eb3de936fad..7f7d38a09c5 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -238,6 +238,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController *::ApplicationSettingsHelper.visible_attributes, *::ApplicationSettingsHelper.external_authorization_service_attributes, *ApplicationSetting.repository_storages_weighted_attributes, + *ApplicationSetting.kroki_formats_attributes.keys.map { |key| "kroki_formats_#{key}".to_sym }, :lets_encrypt_notification_email, :lets_encrypt_terms_of_service_accepted, :domain_denylist_file, |