Check default_artifacts_expire_in only if existed

4eff5eb8 · Lin Jen-Shin · a1b06a82 · 4eff5eb8
Commit 4eff5eb8 authored Feb 14, 2017 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app/models/application_setting.rb app/models/application_setting.rb +2 -1

No files found.
--- 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}")