aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Mescalchin <peter@magnetikonline.com>2017-06-03 17:02:55 +1000
committer无闻 <u@gogs.io>2017-06-03 03:02:55 -0400
commit21c1b8d834c8f9a4c44861f5ac1388e10efe4928 (patch)
treeffe1e3620a4deebe4a62efbd92344c0d51d31b41
parent16913ba8141c997367f5ec91126d2073b0324455 (diff)
conf: rename attachment toggle from ENABLE to ENABLED (#4474)
-rw-r--r--conf/app.ini2
-rw-r--r--pkg/setting/setting.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 5adaaff5..fc43868e 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -297,7 +297,7 @@ ENABLE_FEDERATED_AVATAR = true
; Attachment settings for issues
[attachment]
; Whether attachments are enabled. Defaults to `true`
-ENABLE = true
+ENABLED = true
; Path for attachments. Defaults to `data/attachments`
PATH = data/attachments
; One or more allowed types, e.g. image/jpeg|image/png
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 1b701d12..09bc4969 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -515,7 +515,7 @@ func NewContext() {
AttachmentAllowedTypes = strings.Replace(sec.Key("ALLOWED_TYPES").MustString("image/jpeg,image/png"), "|", ",", -1)
AttachmentMaxSize = sec.Key("MAX_SIZE").MustInt64(4)
AttachmentMaxFiles = sec.Key("MAX_FILES").MustInt(5)
- AttachmentEnabled = sec.Key("ENABLE").MustBool(true)
+ AttachmentEnabled = sec.Key("ENABLED").MustBool(true)
TimeFormat = map[string]string{
"ANSIC": time.ANSIC,