summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-02-15 16:03:58 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-02-15 16:03:58 +0800
commitb72f00c7cfdc854640cbb118c741a116ae4fd8ba (patch)
tree1c01b0db5ac2a2c209d5db4c796cb204b11a6573 /app/models/application_setting.rb
parentcfd839d6f5092be2f5224eddc155f6cf05cd1be6 (diff)
downloadgitlab-ce-b72f00c7cfdc854640cbb118c741a116ae4fd8ba.tar.gz
Update docs to reflect current behaviour
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 19af40eacb4..6d5f02a1011 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -310,7 +310,7 @@ class ApplicationSetting < ActiveRecord::Base
if ChronicDuration.parse(default_artifacts_expire_in).nil?
errors.add(:default_artifacts_expire_in,
- "can't be 0. Leave it blank for unlimited")
+ "can't be 0. Leave it blank for no expiration")
false
else
true