better naming on #891

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

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

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())

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:

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() {

templates/.VERSION

@@ -1 +1 @@
-0.5.13.0210 Beta
+0.5.13.0211 Beta

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>