Introduce DurationValidator, feedback:27762-add-default-artifacts-expiration

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_24032923

1 files changed, 1 insertions, 8 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 99759ec4cae..dc36c754438 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -80,8 +80,7 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
 
-  validates :default_artifacts_expire_in, presence: true
-  validate  :check_default_artifacts_expire_in
+  validates :default_artifacts_expire_in, presence: true, duration: true
 
   validates :container_registry_token_expire_delay,
             presence: true,
@@ -305,10 +304,4 @@ class ApplicationSetting < ActiveRecord::Base
     errors.add(:repository_storages, "can't include: #{invalid.join(", ")}") unless
       invalid.empty?
   end
-
-  def check_default_artifacts_expire_in
-    ChronicDuration.parse(default_artifacts_expire_in)
-  rescue ChronicDuration::DurationParseError
-    errors.add(:default_artifacts_expire_in, "is not a correct duration")
-  end
 end