diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/models/concerns/project_features_compatibility.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
| download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/models/concerns/project_features_compatibility.rb')
| -rw-r--r-- | app/models/concerns/project_features_compatibility.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/concerns/project_features_compatibility.rb b/app/models/concerns/project_features_compatibility.rb index d37f20e2e7c..b910c0ab5c2 100644 --- a/app/models/concerns/project_features_compatibility.rb +++ b/app/models/concerns/project_features_compatibility.rb @@ -124,8 +124,13 @@ module ProjectFeaturesCompatibility private def write_feature_attribute_boolean(field, value) - access_level = Gitlab::Utils.to_boolean(value) ? ProjectFeature::ENABLED : ProjectFeature::DISABLED - write_feature_attribute_raw(field, access_level) + value_type = Gitlab::Utils.to_boolean(value) + if value_type.in?([true, false]) + access_level = value_type ? ProjectFeature::ENABLED : ProjectFeature::DISABLED + write_feature_attribute_raw(field, access_level) + else + write_feature_attribute_string(field, value) + end end def write_feature_attribute_string(field, value) |