summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/application_setting.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 2b97027c018..818223dcc86 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -298,7 +298,8 @@ class ApplicationSetting < ActiveRecord::Base
end
def check_default_artifacts_expire_in
- ChronicDuration.parse(default_artifacts_expire_in)
+ ChronicDuration.parse(default_artifacts_expire_in) if
+ default_artifacts_expire_in
true
rescue ChronicDuration::DurationParseError => e
errors.add(:default_artifacts_expire_in, ": #{e.message}")