diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-16 23:40:13 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-16 23:40:13 +0800 |
commit | eede4ab1a2509ef4aa14d21527386224c4116adc (patch) | |
tree | 683b80180d6a53d77540f7f4d4344fb84b08f115 /app/models/application_setting.rb | |
parent | 37cc3aaefb65e775bd3baa93dd7dec218a76a23c (diff) | |
download | gitlab-ce-eede4ab1a2509ef4aa14d21527386224c4116adc.tar.gz |
0 for unlimited, disallow blank, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23520780
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r-- | app/models/application_setting.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index d64a847d487..36832185b6f 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -269,14 +269,6 @@ class ApplicationSetting < ActiveRecord::Base self.repository_storages = [value] end - def default_artifacts_expire_in=(value) - if value.present? - super(value.squish) - else - super(nil) - end - end - # Choose one of the available repository storage options. Currently all have # equal weighting. def pick_repository_storage @@ -306,10 +298,10 @@ class ApplicationSetting < ActiveRecord::Base end def check_default_artifacts_expire_in - if default_artifacts_expire_in && - ChronicDuration.parse(default_artifacts_expire_in).nil? - errors.add(:default_artifacts_expiration, - "can't be 0. Leave it blank for no expiration") + if default_artifacts_expire_in.blank? + errors.add(:default_artifacts_expiration, "is not presented") + else + ChronicDuration.parse(default_artifacts_expire_in) end rescue ChronicDuration::DurationParseError errors.add(:default_artifacts_expiration, "is invalid") |