better naming on #891

diff --git a/conf/app.ini b/conf/app.ini
index e80d77a9ca5b9415df8c81c67e1da5e7be707233..2019557bd46a18893c69dcd432044155a7e2c529 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -90,7 +90,7 @@ TASK_INTERVAL = 1
 ; Deliver timeout in seconds
 DELIVER_TIMEOUT = 5
 ; Allow insecure certification
-ALLOW_INSECURE_CERTIFICATION = false
+SKIP_TLS_VERIFY = false
 
 [mailer]
 ENABLED = false

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 9e691171a4195cd9397ae62cc06113dabf217358..6b59be7391c21ceadc4e1b119bce56eadc58db33 100644 (file)
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -647,7 +647,7 @@ config.reset_password_code_lives = Reset Password Code Lives
 config.webhook_config = Webhook Configuration
 config.task_interval = Task Interval
 config.deliver_timeout = Deliver Timeout
-config.allow_insecure_certification = Allow Insecure Certification
+config.skip_tls_verify = Skip TLS Verify
 config.mailer_config = Mailer Configuration
 config.mailer_enabled = Enabled
 config.mailer_name = Name

diff --git a/gogs.go b/gogs.go
index b2f45b333f3278e286d028c0a8c782ae3b3b1c63..eac5936218c2d65b0810a93432a63025962a1f30 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.13.0210 Beta"
+const APP_VER = "0.5.13.0211 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/models/webhook.go b/models/webhook.go
index 34349bb598c17548b80c4fab915093c7ed9cc4b8..96af0b6967c11508ee7ec647135544bdeb65365a 100644 (file)
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -315,7 +315,7 @@ func DeliverHooks() {
                        req := httplib.Post(t.Url).SetTimeout(timeout, timeout).
                                Header("X-Gogs-Delivery", t.Uuid).
                                Header("X-Gogs-Event", string(t.EventType)).
-                               SetTLSClientConfig(&tls.Config{InsecureSkipVerify: setting.Webhook.AllowInsecureCertification})
+                               SetTLSClientConfig(&tls.Config{InsecureSkipVerify: setting.Webhook.SkipTLSVerify})
 
                        switch t.ContentType {
                        case JSON:

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index d71a8cda555e1400f132ec70f0094b10cdecf7c7..6664c419077500d68db36586f60b53a248de5342 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -69,9 +69,9 @@ var (
 
        // Webhook settings.
        Webhook struct {
-               TaskInterval               int
-               DeliverTimeout             int
-               AllowInsecureCertification bool
+               TaskInterval   int
+               DeliverTimeout int
+               SkipTLSVerify  bool
        }
 
        // Repository settings.
@@ -514,7 +514,7 @@ func newWebhookService() {
        sec := Cfg.Section("webhook")
        Webhook.TaskInterval = sec.Key("TASK_INTERVAL").MustInt(1)
        Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5)
-       Webhook.AllowInsecureCertification = sec.Key("ALLOW_INSECURE_CERTIFICATION").MustBool()
+       Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool()
 }
 
 func NewServices() {

diff --git a/templates/.VERSION b/templates/.VERSION
index 8f04f6d0da7c14e4c70b2ea15416e62cf19316e1..2aad3653cb4615d07f0b74a6e3bebb7838b23950 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.13.0210 Beta
\ No newline at end of file
+0.5.13.0211 Beta
\ No newline at end of file

diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 5cf84beb99f19713f0488c942f5b6f334e88c09d..6c328353bc9eb546e2d3cb99705b875b10a35c42 100644 (file)
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -105,8 +105,8 @@
                                     <dd>{{.Webhook.TaskInterval}} {{.i18n.Tr "tool.raw_minutes"}}</dd>
                                     <dt>{{.i18n.Tr "admin.config.deliver_timeout"}}</dt>
                                     <dd>{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
-                                    <dt>{{.i18n.Tr "admin.config.allow_insecure_certification"}}</dt>
-                                    <dd><i class="fa fa{{if .Webhook.AllowInsecureCertification}}-check{{end}}-square-o"></i></dd>
+                                    <dt>{{.i18n.Tr "admin.config.skip_tls_verify"}}</dt>
+                                    <dd><i class="fa fa{{if .Webhook.SkipTLSVerify}}-check{{end}}-square-o"></i></dd>
                                 </dl>
                             </div>
                         </div>