diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-23 12:10:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-23 12:10:00 +0300 |
| commit | 02cf17adf0ff486eb6c91af4e9e7427da2f278e2 (patch) | |
| tree | 5ce03ca0a3d79400a88a62099e87e7ef99fc6e9a /app/controllers | |
| parent | 5dde7dc9b8390689add494d877d6863228484829 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -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 b5edecbd6a5..cd099173718 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -179,6 +179,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController *::ApplicationSettingsHelper.visible_attributes, *::ApplicationSettingsHelper.external_authorization_service_attributes, *ApplicationSetting.kroki_formats_attributes.keys.map { |key| "kroki_formats_#{key}".to_sym }, + :can_create_organization, :lets_encrypt_notification_email, :lets_encrypt_terms_of_service_accepted, :domain_denylist_file, |