diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-04 18:09:30 +0000 |
|---|---|---|
| committer | nao.hashizume <nhashizume@gitlab.com> | 2022-07-04 12:42:07 -0700 |
| commit | f712a0c6de61c94f48c12a25f0cdb1db6bd51c94 (patch) | |
| tree | 177ced5ef7f03cd1f76e44a6f56c7cc281d06ffc /app/models/namespace_setting.rb | |
| parent | 0af8d072b36d81d60ad817f1bda0cfc35615096e (diff) | |
| download | gitlab-ce-nao-test-foss-failure.tar.gz | |
Add latest changes from gitlab-org/gitlab@masternao-test-foss-failure
Diffstat (limited to 'app/models/namespace_setting.rb')
| -rw-r--r-- | app/models/namespace_setting.rb | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb index 504daf2662e..595e34821af 100644 --- a/app/models/namespace_setting.rb +++ b/app/models/namespace_setting.rb @@ -24,14 +24,27 @@ class NamespaceSetting < ApplicationRecord chronic_duration_attr :subgroup_runner_token_expiration_interval_human_readable, :subgroup_runner_token_expiration_interval chronic_duration_attr :project_runner_token_expiration_interval_human_readable, :project_runner_token_expiration_interval - NAMESPACE_SETTINGS_PARAMS = [:default_branch_name, :delayed_project_removal, - :lock_delayed_project_removal, :resource_access_token_creation_allowed, - :prevent_sharing_groups_outside_hierarchy, :new_user_signups_cap, - :setup_for_company, :jobs_to_be_done, :runner_token_expiration_interval, :enabled_git_access_protocol, - :subgroup_runner_token_expiration_interval, :project_runner_token_expiration_interval].freeze + NAMESPACE_SETTINGS_PARAMS = %i[ + default_branch_name + delayed_project_removal + lock_delayed_project_removal + resource_access_token_creation_allowed + prevent_sharing_groups_outside_hierarchy + new_user_signups_cap + setup_for_company + jobs_to_be_done + runner_token_expiration_interval + enabled_git_access_protocol + subgroup_runner_token_expiration_interval + project_runner_token_expiration_interval + ].freeze self.primary_key = :namespace_id + def self.allowed_namespace_settings_params + NAMESPACE_SETTINGS_PARAMS + end + sanitizes! :default_branch_name def prevent_sharing_groups_outside_hierarchy |