From d02e45f985ce371eb33fcca86bf80ca078be1d88 Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Wed, 11 Feb 2015 12:04:01 -0500
Subject: [PATCH] better naming on #891

---
 conf/app.ini                 | 2 +-
 conf/locale/locale_en-US.ini | 2 +-
 gogs.go                      | 2 +-
 models/webhook.go            | 2 +-
 modules/setting/setting.go   | 8 ++++----
 templates/.VERSION           | 2 +-
 templates/admin/config.tmpl  | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/conf/app.ini b/conf/app.ini
index e80d77a9..2019557b 100644
--- 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 9e691171..6b59be73 100644
--- 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 b2f45b33..eac59362 100644
--- 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 34349bb5..96af0b69 100644
--- 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 d71a8cda..6664c419 100644
--- 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 8f04f6d0..2aad3653 100644
--- 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 5cf84beb..6c328353 100644
--- 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>