summaryrefslogtreecommitdiff
path: root/lib/api/settings.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-02-15 15:31:25 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-02-15 15:31:51 +0800
commitcfd839d6f5092be2f5224eddc155f6cf05cd1be6 (patch)
tree991d7733486399d04d5c9cbade669a12b7aa90c8 /lib/api/settings.rb
parent602f3b84c08c06cd132a8c53c7bcbb3a139cebfd (diff)
downloadgitlab-ce-cfd839d6f5092be2f5224eddc155f6cf05cd1be6.tar.gz
Fix tests and disallow 0 to make it consistent with .gitlab-ci.yml
Diffstat (limited to 'lib/api/settings.rb')
-rw-r--r--lib/api/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index f46e7e0bcf1..936c7e0930b 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -57,7 +57,7 @@ module API
requires :shared_runners_text, type: String, desc: 'Shared runners text '
end
optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size for each job's artifacts"
- optional :default_artifacts_expire_in, type: Integer, desc: "Set the default expiration time for each job's artifacts"
+ optional :default_artifacts_expire_in, type: String, desc: "Set the default expiration time for each job's artifacts"
optional :max_pages_size, type: Integer, desc: 'Maximum size of pages in MB'
optional :container_registry_token_expire_delay, type: Integer, desc: 'Authorization token duration (minutes)'
optional :metrics_enabled, type: Boolean, desc: 'Enable the InfluxDB metrics'