Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-24 05:39:46 +02:00
Code Issues Activity

add config options for HELO

Browse Source
This commit is contained in:
Unknwon committed 2015-07-03 14:08:18 +08:00
1 parent c76ee1cf83
commit c47afdff58
7 files changed
+61 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gopmfile
+1
View File
@@ -24,6 +24,7 @@ github.com/macaron-contrib/session = commit:31e841d95c
github.com/macaron-contrib/toolbox = commit:acbfe36e16 github.com/macaron-contrib/toolbox = commit:acbfe36e16
github.com/mattn/go-sqlite3 = commit:e28cd440fa github.com/mattn/go-sqlite3 = commit:e28cd440fa
github.com/microcosm-cc/bluemonday = commit:fcd0f5074e github.com/microcosm-cc/bluemonday = commit:fcd0f5074e
github.com/msteinert/pam =
github.com/nfnt/resize = commit:53e9ca890b github.com/nfnt/resize = commit:53e9ca890b
github.com/russross/blackfriday = commit:6928e11ecd github.com/russross/blackfriday = commit:6928e11ecd
github.com/shurcooL/go = commit:bc30a0bd33 github.com/shurcooL/go = commit:bc30a0bd33
conf/app.ini
+4
View File
@@ -105,6 +105,10 @@ SUBJECT = %(APP_NAME)s
; QQ: smtp.qq.com:25 ; QQ: smtp.qq.com:25
; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used. ; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
HOST = HOST =
; Disable HELO operation when hostname are different.
DISABLE_HELO =
; Custom hostname for HELO operation, default is from system.
HELO_HOSTNAME =
; Do not verify the certificate of the server. Only use this for self-signed certificates ; Do not verify the certificate of the server. Only use this for self-signed certificates
SKIP_VERIFY = SKIP_VERIFY =
; Use client certificate ; Use client certificate
gogs.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.1.0327 Beta" const APP_VER = "0.6.1.0703 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
modules/bindata/bindata.go
+39 -39
View File
@@ -61,7 +61,7 @@ func (fi bindata_file_info) Sys() interface{} {
return nil return nil
} }
var _conf_app_ini = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\x59\xcd\x73\xe3\x46\x76\xbf\xe3\xaf\xe8\xa1\xe3\x78\x26\xc5\x2f\x49\x1e\x8d\x2c\x5b\x89\x29\x12\x94\xb0\xe2\x97\x01\x4a\xf2\x78\x4a\x85\x81\x80\x26\x09\x0b\x44\x63\xd0\x80\x24\x6e\xe5\x10\x57\x0e\xb9\x27\x5b\xc9\x25\x87\xe4\x90\x4a\x55\x92\x4d\x2a\xb7\xdd\xad\xca\xc9\x95\xbb\xfd\x3f\xb8\xbc\x9b\xff\x22\xbf\xd7\x0d\x90\xa0\x46\x9e\xf5\x6e\xb2\x35\x53\x22\xd0\x1f\xaf\xdf\xf7\xfb\xbd\xc6\x7b\x6c\x64\x5e\x98\x36\x53\x7f\x86\xe3\x9e\xd5\x7f\xc9\xa6\xa7\x96\xc3\xfa\xd6\xc0\x34\xde\x63\x93\x81\xd9\x71\x4c\x36\xec\x9c\x99\xac\x7b\xda\x19\x9d\x98\x0e\x1b\x8f\x58\x77\x6c\xdb\xa6\x33\x19\x8f\x7a\xd6\xe8\x84\x75\xcf\x9d\xe9\x78\x88\xc1\x51\xdf\x3a\xd1\x3b\x8d\x8f\x59\x27\x49\x58\xec\x2d\x39\xcb\x16\x5e\xc6\xe4\x42\xdc\x49\x26\x62\xc6\x6f\x79\xba\x62\x89\x37\xc7\x44\x98\x45\xdc\xe8\x4c\x26\xee\xa8\x33\x34\xd9\x11\x3b\x11\x73\x79\x88\xbf\xec\x24\xcc\x98\xc3\xd3\xdb\xd0\xe7\xa0\xd4\x5d\x78\x31\x96\x63\x2c\x9c\xb1\x95\xc8\x59\x9a\xc7\x2c\x12\xbe\x17\x45\x2b\xc3\x3e\x1f\xb9\xe7\x0e\xb8\x3f\x62\xf3\x30\xc3\x6a\x33\xcc\x16\x3c\x65\xb5\x80\xdf\xd6\xea\xac\x96\xa4\x22\xa8\x31\x81\x81\x8c\xcb\x0c\x23\x01\x9f\x79\x79\x04\x5a\x52\xaf\x51\x14\x20\x3a\x31\x80\x77\xc3\x78\x95\xf2\x44\xc8\x30\x13\xe9\xea\xca\xb0\xc7\xe3\x29\x3b\x32\x9c\xae\x6d\x4d\xa6\xee\xf4\xe5\x84\x96\x5d\x7b\x72\x81\x75\x12\x1c\xf2\xf4\xca\x98\xd8\xe3\xe9\xb8\x3b\x1e\x60\x66\x91\x65\x89\xd1\x1b\x0f\x3b\xd6\x08\x6f\x8a\xc7\x85\x90\x99\x22\xe3\x9e\xdb\xb4\xe4\xfd\xa7\xe5\xfa\x67\xf2\xb0\xd5\x7a\xff\xa9\x5e\x8e\x97\xf7\x9f\x9e\x4e\xa7\x13\x77\x32\xb6\xa7\xcf\x64\xcb\x50\x2f\x9d\x5e\x0f\xa2\x19\xeb\x09\x10\xd8\x6b\xb7\xdb\x90\xb3\x17\x4a\xef\x3a\xe2\xcc\x71\x4e\xd9\x8c\x7b\x59\x9e\x72\x76\xb7\xe0\x31\x8b\x45\xc6\xbc\x5b\x2f\x8c\x68\xda\xe8\x59\x4e\xe7\x78\x60\xba\xb4\xec\x88\xcd\xbc\x48\x72\x03\xcf\x25\xb1\xdd\xdd\x0a\xa9\x6e\x6f\x44\xf6\x89\x59\x18\x97\x8a\x5b\x8a\x80\x1b\xe3\x7e\x7f\x60\x8d\xcc\x52\x4b\x9a\x48\x49\xd8\x1e\x9f\x4f\x4d\xdb\x1d\x8c\x4f\xd6\x53\x1f\xb3\x13\x1e\xf3\xd4\xcb\x38\x93\x19\x4f\xe4\x21\x46\xfe\x88\xf9\x01\xcc\x9e\x2d\x5a\x99\x68\xcd\x61\xe8\x96\x9f\xcb\x4c\x2c\x5b\xa4\x32\xa9\x16\x34\xd5\x38\xf3\x79\x9a\xb1\x86\xef\x1d\x65\x69\xce\x59\x23\xc8\x41\x28\x14\xf1\xd1\xc1\x8b\xfd\xf6\xa2\xbd\x6c\x4b\xd6\x20\x9d\x1e\x2d\x57\xf4\xd3\xe4\xf7\xde\x32\x89\x78\xd3\x17\x4b\xe3\x63\xd0\x19\xa7\x6c\x96\x8a\x25\xf3\x58\x33\x99\xdd\xb3\x59\x08\xc1\xf8\x7d\x22\xd2\x8c\x07\x7a\x06\xfe\xc1\x2e\xc3\x38\x20\x8f\xa4\xc3\xc2\x59\xe8\x6b\x5e\x05\x74\xf8\x34\x10\xa0\x42\x4a\x9c\x89\x74\xce\x33\x96\x89\x62\xbf\xda\x98\xa4\xe1\x2d\x2d\xbe\xe1\xab\x67\x5a\x2e\x91\xf0\x58\xca\x88\x25\x37\xbe\xdc\xd9\x65\x0d\x28\x8f\xa8\xaa\xd3\x1b\x22\xcf\x8a\x37\xbe\x64\x8d\x58\x60\x9b\xfc\x71\xbb\xb0\xb2\xdc\x44\x13\x92\x1e\x02\x2e\x8d\xae\x69\x4f\x5d\x0a\x32\xa8\xbb\xaa\xc2\x56\x79\x8c\x71\x66\xbe\x7c\x74\x41\x41\x11\xc7\x9f\x27\x09\x42\x24\x82\xad\x23\x26\x66\x2c\xe3\xd0\x20\x09\xe5\xc5\x01\xb4\x00\x75\xfb\x5a\x6f\x64\x2f\x2c\xaf\x84\x8c\x52\x01\x46\xc9\xd5\xa0\x2c\x8a\x58\x1a\xe6\xf7\xdc\xcf\xa1\x60\xc3\x99\x76\xa6\x56\xd7\x55\xfe\x3e\xe9\x4c\xe1\x73\x3a\x15\x44\xa4\x62\x58\xb1\x38\xf4\xe4\x0b\x6b\xc2\x64\x9e\x90\x5a\x0d\x73\xa4\x1c\x49\x8d\x6d\x5c\x68\x00\x66\xc2\x78\xae\x53\x05\x4c\x01\x93\xc4\x8d\x48\xcc\xe7\x30\x63\x8e\xd0\x93\x75\xe6\x7b\x31\xbb\xe6\xac\xb6\x10\x4b\xae\x63\x1c\x86\x8a\x60\xc4\x9a\x31\xe8\xa8\xdc\x04\x1e\x4e\x48\x0f\xb4\x02\x11\x1b\x78\x99\x87\xe0\xe5\x57\x95\x3c\xb1\x5c\xc9\x37\x91\xca\x14\xf0\xa6\x79\xca\xa5\xa6\x84\xc1\x30\xe3\x7b\x98\x08\xb3\x0f\x24\xa5\x9d\x94\xf9\x0b\x41\x19\xa9\x77\x5c\x26\x02\xb5\xd7\x38\x1d\x3b\x14\x4a\x3b\xbb\x2f\x9a\x6d\xfc\xdb\x39\xdc\xdb\x6b\xef\x1b\x45\x4e\x23\x97\x36\x8a\x04\x95\x0a\x91\x19\x93\x8e\xe3\x5c\xf6\x94\x5e\xfa\x74\x50\xe5\xd8\x38\x5a\xd5\x19\x2f\xf3\x97\x0e\x4a\xe2\x2c\xe5\x6f\xf2\x30\x2d\x44\x44\xca\x09\x67\xab\xc6\x2c\x8f\xa2\x1a\x22\x79\xb0\xce\x5d\x7a\x7d\x49\xb6\xe4\x5f\x51\x35\xb4\x29\x18\xc9\xaf\x82\xac\x19\x5c\x43\x1d\x5e\xb0\x0c\xe3\x2b\x95\xc9\xfc\x3c\x0d\x33\xe4\x3b\x6b\x04\x0b\x0e\x06\x08\xe7\xee\x59\xc5\x18\x4f\x9e\xe8\xec\xaf\x8b\xc3\x74\xcc\xce\x4c\x73\xc2\x5e\x8e\xcf\x6d\xa6\x64\xeb\x75\xa6\x1d\xe6\x74\xfa\xe6\x93\x27\x86\x63\x76\x6d\x73\xea\xc2\x0b\x41\xe0\xc9\x7b\x9f\xf6\x7b\xe6\xa5\x8d\xff\x7f\xfc\x27\x4f\xc9\x17\xf2\x4c\x90\x19\xe1\xef\x29\x5f\xf2\xe5\x35\x64\x0d\x3c\x04\x05\x12\x88\x35\x72\x6d\x73\x68\x0e\x8f\x91\x4f\x7a\x9d\x97\x0e\xf6\xbf\x30\xba\xe3\xf1\x99\x65\xaa\x1c\x5f\x51\xa9\xeb\xdd\x71\x49\x46\x2d\xa6\xd7\xfb\xaa\x6b\xc2\xd8\x4f\x79\x10\x6a\xad\xd8\x54\x79\x24\x05\xb0\xb8\x5f\x31\x2f\x87\x96\xe3\xac\xf4\xca\x05\xf7\x02\x30\xa2\xea\x15\x02\x82\xfc\x4b\xbd\x18\x36\x55\x46\xc7\x74\x91\xb3\x3f\x7f\xe9\x76\xce\xa7\xa7\xe6\x08\x0e\x0e\x27\x1f\xaf\xeb\xce\xe7\x8d\x4b\xf3\x98\xa6\x1a\x34\x50\x14\x06\x38\xca\x95\xd1\xe9\x4e\xad\x0b\xd3\xed\xc2\x42\xee\x80\x9e\x86\xd6\x08\xd9\x92\x04\xdb\x39\x68\x83\xb8\x63\x52\x98\x90\x43\xfc\xe0\x22\x44\xab\xe2\x86\xc3\xef\x91\x8a\x7c\x11\xcf\xc2\x74\xc9\x78\x63\x89\x14\xaf\x02\x23\xe5\xf3\x5Line truncated var _conf_app_ini = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\x59\xcd\x73\xe3\x46\x76\xbf\xe3\xaf\xe8\xa1\xe3\x78\x26\xc5\x2f\x49\x9e\x0f\xcb\x56\x62\x8a\x04\x25\xac\xf8\x65\x80\x94\x3c\x9e\x52\x61\x20\xa0\x49\xc2\x02\xd1\x18\x34\x20\x89\x5b\x39\xc4\x95\x43\xee\xc9\x56\x72\xc9\x21\x39\xa4\x52\x95\x64\x93\xca\x6d\x77\xab\x72\x72\xe5\x6e\xff\x0f\x2e\xef\xe6\xbf\xc8\xef\x75\x03\x24\xa8\x91\x67\xbd\x9b\x6c\xcd\x94\x08\xf4\xc7\xeb\x7e\xaf\xdf\xfb\xbd\xdf\x6b\xbc\xc7\x46\xe6\xb9\x69\x33\xf5\x67\x38\xee\x59\xfd\x97\x6c\x7a\x6a\x39\xac\x6f\x0d\x4c\xe3\x3d\x36\x19\x98\x1d\xc7\x64\xc3\xce\x99\xc9\xba\xa7\x9d\xd1\x89\xe9\xb0\xf1\x88\x75\xc7\xb6\x6d\x3a\x93\xf1\xa8\x67\x8d\x4e\x58\x77\xe6\x4c\xc7\x43\x34\x8e\xfa\xd6\x89\x9e\x69\x7c\xcc\x3a\x49\xc2\x62\x6f\xc5\x59\xb6\xf4\x32\x26\x97\xe2\x56\x32\x11\x33\x7e\xc3\xd3\x35\x4b\xbc\x05\x3a\xc2\x2c\xe2\x46\x67\x32\x71\x47\x9d\xa1\xc9\x8e\xd8\x89\x58\xc8\x43\xfc\x65\x27\x61\xc6\x1c\x9e\xde\x84\x3e\x87\xa4\xee\xd2\x8b\x31\x1c\x6d\xe1\x9c\xad\x45\xce\xd2\x3c\x66\x91\xf0\xbd\x28\x5a\x1b\xf6\x6c\xe4\xce\x1c\xec\xfe\x88\x2d\xc2\x0c\xa3\xcd\x30\x5b\xf2\x94\xd5\x02\x7e\x53\xab\xb3\x5a\x92\x8a\xa0\xc6\x04\x1a\x32\x2e\x33\xb4\x04\x7c\xee\xe5\x11\x64\x49\x3d\x46\x49\x80\xea\xb4\x01\xbc\x1b\xc6\xab\x94\x27\x42\x86\x99\x48\xd7\x97\x86\x3d\x1e\x4f\xd9\x91\xe1\x74\x6d\x6b\x32\x75\xa7\x2f\x27\x34\xec\xca\x93\x4b\x8c\x93\xd8\x21\x4f\x2f\x8d\x89\x3d\x9e\x8e\xbb\xe3\x01\x7a\x96\x59\x96\x18\xbd\xf1\xb0\x63\x8d\xf0\xa6\xf6\xb8\x14\x32\x53\x62\xdc\x99\x4d\x43\xde\x7f\x5c\x8e\x7f\x22\x0f\x5b\xad\xf7\x1f\xeb\xe1\x78\x79\xff\xf1\xe9\x74\x3a\x71\x27\x63\x7b\xfa\x44\xb6\x0c\xf5\xd2\xe9\xf5\xa0\x9a\xb1\xe9\x80\x80\x83\x76\xbb\x0d\x3d\x7b\xa1\xf4\xae\x22\xce\x1c\xe7\x94\xcd\xb9\x97\xe5\x29\x67\xb7\x4b\x1e\xb3\x58\x64\xcc\xbb\xf1\xc2\x88\xba\x8d\x9e\xe5\x74\x8e\x07\xa6\x4b\xc3\x8e\xd8\xdc\x8b\x24\x37\xf0\x5c\x0a\xdb\xdf\xaf\x88\xea\xf6\x46\x74\x3e\x31\x0b\xe3\xd2\x70\x2b\x11\x70\x63\xdc\xef\x0f\xac\x91\x59\x5a\x49\x0b\x29\x05\xdb\xe3\xd9\xd4\xb4\xdd\xc1\xf8\x64\xd3\xf5\x31\x3b\xe1\x31\x4f\xbd\x8c\x33\x99\xf1\x44\x1e\xa2\xe5\x8f\x98\x1f\xe0\xd8\xb3\x65\x2b\x13\xad\x05\x0e\xba\xe5\xe7\x32\x13\xab\x16\x99\x4c\xaa\x01\x4d\xd5\xce\x7c\x9e\x66\xac\xe1\x7b\x47\x59\x9a\x73\xd6\x08\x72\x08\x0a\x45\x7c\xf4\xe2\xf9\xb3\xf6\xb2\xbd\x6a\x4b\xd6\x20\x9b\x1e\xad\xd6\xf4\xd3\xe4\x77\xde\x2a\x89\x78\xd3\x17\x2b\xe3\x63\xc8\x19\xa7\x6c\x9e\x8a\x15\xf3\x58\x33\x99\xdf\xb1\x79\x08\xc5\xf8\x5d\x22\xd2\x8c\x07\xba\x07\xfe\xc1\x2e\xc2\x38\x20\x8f\xa4\xc5\xc2\x79\xe8\xeb\xbd\x0a\xd8\xf0\x71\x20\x20\x85\x8c\x38\x17\xe9\x82\x67\x2c\x13\xc5\x7c\x35\x31\x49\xc3\x1b\x1a\x7c\xcd\xd7\x4f\xb4\x5e\x22\xe1\xb1\x94\x11\x4b\xae\x7d\xb9\xb7\xcf\x1a\x30\x1e\x49\x55\xab\x37\x44\x9e\x15\x6f\x7c\xc5\x1a\xb1\xc0\x34\xf9\xe3\x66\x61\x64\x39\x89\x3a\x24\x3d\x04\x5c\x1a\x5d\xd3\x9e\xba\x14\x64\x30\x77\xd5\x84\xad\x72\x19\xe3\xcc\x7c\xf9\xe0\x80\x42\x22\x96\x9f\x25\x09\x42\x24\xc2\x59\x47\x4c\xcc\x59\xc6\x61\x41\x52\xca\x8b\x03\x58\x01\xe6\xf6\xb5\xdd\xe8\xbc\x30\xbc\x12\x32\xca\x04\x68\x25\x57\x83\xb1\x28\x62\xa9\x99\xdf\x71\x3f\x87\x81\x0d\x67\xda\x99\x5a\x5d\x57\xf9\xfb\xa4\x33\x85\xcf\x69\x28\x88\xc8\xc4\x38\xc5\x62\xd1\x93\x2f\xac\x09\x93\x79\x42\x66\x35\xcc\x91\x72\x24\xd5\xb6\x75\xa1\x01\x36\x13\xc6\x0b\x0d\x15\x38\x0a\x1c\x49\xdc\x88\xc4\x62\x81\x63\xcc\x11\x7a\xb2\xce\x7c\x2f\x66\x57\x9c\xd5\x96\x62\xc5\x75\x8c\xe3\xa0\x22\x1c\x62\xcd\x18\x74\x14\x36\x61\x0f\x27\x64\x07\x1a\x81\x88\x0d\xbc\xcc\x43\xf0\xf2\xcb\x0a\x4e\xac\xd6\xf2\x4d\xa4\x90\x02\xde\xb4\x48\xb9\xd4\x92\xd0\x18\x66\xfc\x00\x1d\x61\xf6\x81\x24\xd8\x49\x99\xbf\x14\x84\x48\xbd\xe3\x12\x08\xd4\x5c\xe3\x74\xec\x50\x28\xed\xed\x3f\x6f\xb6\xf1\x6f\xef\xf0\xe0\xa0\xfd\xcc\x28\x30\x8d\x5c\xda\x28\x00\x2a\x15\x22\x33\x26\x1d\xc7\xb9\xe8\x29\xbb\xf4\x69\xa1\xca\xb2\x71\xb4\xae\x33\x5e\xe2\x97\x0e\x4a\xda\x59\xca\xdf\xe4\x61\x5a\xa8\x08\xc8\x09\xe7\xeb\xc6\x3c\x8f\xa2\x1a\x22\x79\xb0\xc1\x2e\x3d\xbe\x14\x5b\xee\x5f\x49\x35\xf4\x51\x30\xd2\x5f\x05\x59\x33\xb8\x82\x39\xbc\x60\x15\xc6\x97\x0a\xc9\xfc\x3c\x0d\x33\xe0\x9d\x35\xc2\x09\x0e\x06\x08\xe7\xee\x59\xe5\x30\x1e\x3d\xd2\xe8\xaf\x93\xc3\x74\xcc\xce\x4c\x73\xc2\x5e\x8e\x67\x36\x53\xba\xf5\x3a\xd3\x0e\x73\x3a\x7d\xf3\xd1\x23\xc3\x31\xbb\xb6\x39\x75\xe1\x85\x10\xf0\xe8\xbd\x4f\xfb\x3d\xf3\xc2\xc6\xff\x3f\xfe\x93\xc7\xe4\x0b\x79\x26\xe8\x18\xe1\xef\x29\x5f\xf1\xd5\x15\x74\x0d\x3c\x04\x05\x00\xc4\x1a\xb9\xb6\x39\x34\x87\xc7\xc0\x93\x5e\xe7\xa5\x83\xf9\xcf\x8d\xee\x78\x7c\x66\x99\x0a\xe3\x2b\x26\x75\xbd\x5b\x2e\xe9\x50\x8b\xee\xcd\xbc\xea\x98\x30\xf6\x53\x1e\x84\xda\x2a\x36\x65\x1e\x49\x01\x2c\xee\xd6\xcc\xcb\x61\xe5\x38\x2b\xbd\x72\xc9\xbd\x00\x1b\x51\xf9\x0a\x01\x41\xfe\xa5\x5e\x0c\x9b\x32\xa3\x63\xba\xc0\xec\xcf\x5f\xba\x9d\xd9\xf4\xd4\x1c\xc1\xc1\xe1\xe4\xe3\x4d\xde\xf9\xbc\x71\x61\x1e\x53\x57\x83\x1a\x8a\xc4\x00\x47\xb9\x34\x3a\xdd\xa9\x75\x6e\xba\x5d\x9c\x90\x3b\xa0\xa7\xa1\x35\x02\x5a\x92\x62\x7b\x2f\xda\x10\xee\x98\x14\x26\xe4\x10\x3f\x38\x08\xd1\xaa\x76\xc3\xe1\xf7\x80\x22\x5f\xc4\xf3\x30\x5d\x31\xde\x58\x01\xe2\x55\x60\xaLine truncated
func conf_app_ini_bytes() ([]byte, error) { func conf_app_ini_bytes() ([]byte, error) {
return bindata_read( return bindata_read(
@@ -76,7 +76,7 @@ func conf_app_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/app.ini", size: 8720, mode: os.FileMode(420), modTime: time.Unix(1427320367, 0)} info := bindata_file_info{name: "conf/app.ini", size: 8869, mode: os.FileMode(420), modTime: time.Unix(1435902851, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -96,7 +96,7 @@ func conf_gitignore_android() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/Android", size: 270, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/Android", size: 270, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -116,7 +116,7 @@ func conf_gitignore_c() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/C", size: 143, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/C", size: 143, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -136,7 +136,7 @@ func conf_gitignore_c_sharp() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/C Sharp", size: 1520, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/C Sharp", size: 1520, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -156,7 +156,7 @@ func conf_gitignore_c_() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/C++", size: 126, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/C++", size: 126, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -176,7 +176,7 @@ func conf_gitignore_google_go() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/Google Go", size: 251, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/Google Go", size: 251, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -196,7 +196,7 @@ func conf_gitignore_java() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/Java", size: 188, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/Java", size: 188, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -216,7 +216,7 @@ func conf_gitignore_objective_c() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/Objective-C", size: 280, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/Objective-C", size: 280, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -236,7 +236,7 @@ func conf_gitignore_python() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/Python", size: 314, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/Python", size: 314, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -256,7 +256,7 @@ func conf_gitignore_ruby() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/gitignore/Ruby", size: 158, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/gitignore/Ruby", size: 158, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -276,7 +276,7 @@ func conf_license_affero_gpl() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/Affero GPL", size: 34499, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/Affero GPL", size: 34499, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -296,7 +296,7 @@ func conf_license_apache_v2_license() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/Apache v2 License", size: 11323, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/Apache v2 License", size: 11323, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -316,7 +316,7 @@ func conf_license_artistic_license_2_0() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/Artistic License 2.0", size: 8887, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/Artistic License 2.0", size: 8887, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -336,7 +336,7 @@ func conf_license_bsd_3_clause_license() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/BSD (3-Clause) License", size: 1473, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/BSD (3-Clause) License", size: 1473, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -356,7 +356,7 @@ func conf_license_bsd_license() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/BSD license", size: 1280, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/BSD license", size: 1280, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -376,7 +376,7 @@ func conf_license_cc0_1_0_universal() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/CC0 1.0 Universal", size: 6554, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/CC0 1.0 Universal", size: 6554, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -396,7 +396,7 @@ func conf_license_eclipse_public_license_v1_0() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/Eclipse Public License v1.0", size: 11513, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/Eclipse Public License v1.0", size: 11513, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -416,7 +416,7 @@ func conf_license_gpl_v2() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/GPL v2", size: 18025, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/GPL v2", size: 18025, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -436,7 +436,7 @@ func conf_license_gpl_v3() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/GPL v3", size: 35120, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/GPL v3", size: 35120, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -456,7 +456,7 @@ func conf_license_isc_license() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/ISC license", size: 716, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/ISC license", size: 716, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -476,7 +476,7 @@ func conf_license_lgpl_v2_1() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/LGPL v2.1", size: 26442, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/LGPL v2.1", size: 26442, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -496,7 +496,7 @@ func conf_license_lgpl_v3() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/LGPL v3", size: 7631, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/LGPL v3", size: 7631, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -516,7 +516,7 @@ func conf_license_mit_license() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/MIT License", size: 1065, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/MIT License", size: 1065, mode: os.FileMode(420), modTime: time.Unix(1398226579, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -536,7 +536,7 @@ func conf_license_mozilla_public_license_version_2_0() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/license/Mozilla Public License Version 2.0", size: 15920, mode: os.FileMode(420), modTime: time.Unix(1424928463, 0)} info := bindata_file_info{name: "conf/license/Mozilla Public License Version 2.0", size: 15920, mode: os.FileMode(420), modTime: time.Unix(1409469215, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -556,7 +556,7 @@ func conf_locale_translators() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/TRANSLATORS", size: 443, mode: os.FileMode(420), modTime: time.Unix(1426831108, 0)} info := bindata_file_info{name: "conf/locale/TRANSLATORS", size: 443, mode: os.FileMode(420), modTime: time.Unix(1427400843, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -576,12 +576,12 @@ func conf_locale_locale_de_de_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_de-DE.ini", size: 33641, mode: os.FileMode(493), modTime: time.Unix(1429881508, 0)} info := bindata_file_info{name: "conf/locale/locale_de-DE.ini", size: 33641, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
var _conf_locale_locale_en_us_ini = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xdd\x92\xdb\x38\xb2\xe6\x3d\x9f\x82\xdd\x1b\x5e\xbb\x23\xca\x72\xcc\x4c\xc4\xc6\x46\x87\xed\x8e\xea\x72\xfb\x67\x8e\xcb\x55\xc7\x55\x9e\xd9\xb3\x0e\x07\x87\x12\x29\x89\xa7\x24\x52\x43\x52\xa5\xd6\x5c\xed\x6b\xec\xeb\xed\x93\x6c\x7e\xf9\x83\x1f\x92\x2a\xdb\x73\x36\xf6\xdc\x54\x81\x40\x02\x48\x24\x12\x89\xcc\x44\x02\xca\x77\xbb\xac\x28\xbb\x45\xfa\x22\x3d\x4f\x77\x79\x55\x6f\xca\xae\x4b\xbb\x72\xb3\x7c\xba\x6e\xba\xbe\x2c\xd2\x37\x55\x4f\xdf\xed\x7d\xb5\x28\x93\x64\xdd\x6c\x4b\x02\x7d\x4b\xff\x92\x22\xef\xd6\xf3\x26\x6f\x0b\xca\x78\x65\xe9\xa4\xfc\x7d\xb7\x69\x5a\x00\xfd\x26\xa9\x64\x5d\x6e\x76\xa8\x43\xff\x92\xae\x5a\xd5\x59\x55\xd3\xe7\x0d\xa5\xd2\x77\x75\xd2\x35\x8b\x2a\xdf\x64\x41\x01\x67\x58\xf9\xcf\xe9\x1f\xeb\x22\xbd\xe9\xcb\x5d\xfa\xbc\xdb\xe6\x9b\xcd\xcb\xbc\xe3\x2a\x7d\x99\xe6\x8b\x45\xb3\xaf\xfb\xe7\xcf\xa4\x40\x1a\x6f\xf6\xbd\xb5\x7e\xb5\xef\x25\x6f\xbf\xb3\xac\x4f\xbb\xa4\x2d\x57\x15\x0d\xac\xa5\xac\x8f\x9a\x4c\x0e\xe5\xbc\xab\x7a\x20\xfd\x57\x49\x25\xf7\x65\xdb\x55\x0d\xf0\xf9\x8b\xa4\x92\x5d\xbe\x02\xc0\x35\xfd\x4b\xfa\x72\xbb\xdb\xe4\x5c\xe1\x56\x93\xc9\x26\xaf\x57\x7b\x81\x79\xaf\xc9\x24\xd9\x13\xe5\xea\x9c\x69\xf6\x49\x93\x49\xb9\xcd\xab\x0d\xe8\xf3\x14\x09\x6a\xb7\xeb\x0e\x0d\x53\xf1\x5a\x93\x84\x63\xd6\x1f\x77\x25\xa3\xf8\xf4\x96\x52\xc9\x22\xdf\xf5\x8b\x75\x4e\x39\x17\x92\x4a\x08\x68\xd7\x10\xae\x4d\x7b\x64\x38\xfb\x48\x9a\x76\x95\xd7\xd5\x3f\xf2\x5e\xf0\xbf\x0a\x3e\x93\x6d\xd5\xb6\x0d\x86\x7e\xc9\x89\xa4\x2e\x0f\x19\xda\xa1\x9c\x0f\xe5\x21\x6c\x05\x25\xdb\x6a\xd5\xca\x28\x51\x78\xc9\x5f\x68\x05\x65\xcb\xa6\xbd\xd3\x82\xd7\x48\x0e\xaa\x12\x12\x5a\x1a\xf7\x9f\xd7\x44\x17\x2d\xbd\xe4\x8f\x08\xa0\x4b\xf2\x62\x5b\xd5\xd9\x2e\xaf\x4b\xd0\xe8\x1c\x5f\x44\x17\xfa\x4a\x74\xba\xb3\xae\xec\xfb\xaa\x5e\x75\x28\x96\xac\xf4\x46\xb3\x92\xa0\xcc\xe5\x01\x9f\x2e\x5b\x96\x65\x21\x18\x75\xe9\x6b\x4a\x27\xbb\xfd\x66\x43\x63\xff\xfb\xbe\xec\x7a\xc0\x5f\xd3\x37\x8d\x42\xbe\x93\xaa\xeb\x28\x41\xd9\xef\x38\x91\xd0\x04\xd4\x0b\x46\xe9\x82\x13\x49\xf2\xb9\x2b\xf3\x76\xb1\xfe\x92\xc8\x7f\xee\x11\x89\xd9\x6c\x76\x72\x6a\xc0\x0e\xca\x0a\xd2\x83\x75\x90\x2c\x9a\x02\x1f\x17\xf4\x8f\x9a\xae\xea\xae\x27\x96\xfe\x92\x68\x02\x60\x92\x12\x32\xf6\x55\xbf\x29\x7d\x26\xaf\x8f\x0e\xf3\x90\xbe\xae\xda\xae\x7f\xda\x57\xc4\x72\x1f\xf7\x75\x82\xf1\x11\x3b\x67\xc5\xdc\x56\xf9\x9b\x86\xa8\xc3\xd9\x2d\x8d\xef\xf2\x78\xf3\xaf\xef\xcf\xd2\x6b\x5a\xea\xab\xb6\xa4\x74\x4a\x6d\xd0\x3f\xaa\xf3\xa7\x59\x42\xb5\x94\x0d\x5f\xe5\x7d\x3e\xcf\xbb\x32\x65\x66\x84\x64\x60\x29\xd0\xf5\xd1\x90\xa6\x58\x99\xda\xd0\x05\xe0\xda\xf8\x80\x55\x40\xf9\x10\x0c\x5c\xf9\x7a\x53\x22\x9f\x9a\x4a\xdf\x7d\xf8\x70\xf5\xea\xd7\xb4\xac\x57\x55\x5d\xa6\x87\xaa\x5f\xa7\xfb\x7e\xf9\xdf\xb3\x55\x59\x97\x2d\xc9\x89\x45\x95\x12\xf3\xb7\x34\xcf\x29\x71\xa0\xe0\x3f\x4b\xba\x6e\x93\x6d\x85\x82\x37\x37\xef\xd3\x4b\x50\x71\x97\xf7\x6b\x46\xa4\x5f\x27\xdd\xdf\x37\xa0\x82\xeb\xf0\x76\x5d\xa6\xcb\x8a\x48\xc8\x40\xcd\xd2\x86\x9c\x16\x8a\xe3\x2c\xb1\x0e\x8d\xd4\x6f\xe4\xdb\xb1\x15\x6a\x81\x96\x3c\xd7\x99\x76\xe6\xa7\x3a\xfd\xd8\x34\xbd\x74\xee\x00\x7c\xff\xe7\x34\x67\x90\xab\x6d\xb9\x6d\x68\x7d\x39\x76\xa9\x68\x4a\x0e\x15\x15\xce\xcb\xb4\xcb\xef\x89\x63\xfb\x26\xed\xd7\x55\x97\x16\x34\x5d\x0b\x34\x4c\xcc\xb5\x27\x89\x26\x54\xa7\x29\x16\xca\x5b\x5e\x3c\x44\x86\xda\xee\x69\xb2\xd6\xd4\x18\xe4\x25\x84\x3b\x35\x39\x85\x67\x9a\x93\xa0\xa5\x76\x78\x54\x34\xf7\x0d\x49\x27\xc8\x8f\x57\x9c\xd0\xef\xb0\x7d\xc2\x2a\x5f\x2e\x09\xab\x8e\x88\xfe\x36\x5d\x6c\x1a\x9a\xb1\x4f\x1f\xdf\x53\xe5\x75\xdf\xef\xb2\x5d\xd3\x32\x97\xdc\xde\x5e\x13\x83\xb5\xbd\xcf\x0d\x66\x1e\x30\xf5\x7e\x3b\xa7\xaf\xc3\xba\xa2\x65\x44\x1b\xd2\xa6\x5a\x88\xf0\x62\x52\x6c\x20\xa2\xeb\xb4\xa9\x67\x09\x36\xab\x7d\xcb\x72\x21\x80\xa2\x2e\xad\xe4\x04\x7a\x40\xe1\x19\xfe\xdc\x78\x2c\x79\xb8\x1d\xed\x63\x87\x75\x49\xdb\x15\x0d\xb5\x64\x79\x3c\x13\xf9\xec\xe6\x5d\xa4\x34\x4d\x3b\xef\x80\x7e\xfa\x9f\x5c\xed\xd0\x7b\xbe\xf9\x29\xe9\xb6\x34\x2e\x5d\x13\x37\x97\x34\x5a\x5e\x18\xa8\x46\x13\xa2\x33\x75\x53\xd6\x05\x25\x54\xe6\x6b\x59\xb0\x5e\xb4\xdc\x2d\x9b\xba\xe9\xab\xe5\xd1\x61\xf1\x01\x9f\x36\xe0\x29\x1c\x6c\x57\xcb\x16\x4d\xbd\xac\xda\x2d\x30\xaf\xf3\x39\x55\xb6\x4d\x8e\x64\x0b\x97\x98\x20\xa6\x31\x4a\x27\x1e\xf4\x12\x23\x0d\xbb\x52\x69\x6c\x58\x88\x34\x1e\x09\x5d\x01\x1a\x6e\x73\x26\xc8\xc7\x22\x41\x51\x0c\xcb\x14\x37\x0f\x23\xb5\x07\x5b\xa5\x4a\xc3\x6c\xd5\xb0\x84\x37\xe9\xc7\xcb\xb0\x27\xb1\x9d\xad\xaa\x3e\x5b\x82\xb6\x68\xf3\x35\xea\x62\xfd\x50\x49\xfa\x98\x8a\x1e\xa7\x8b\x66\x4b\x3b\x50\xf1\x73\xfa\xe8\x5e\x65\xc2\x9f\x40\x84\x2c\xbf\x27\x58\x26\xc1\x8b\xf4\xdf\x9a\x7d\x4b\x2b\x52\x44\x92\xa9\x01\x45\x43\x2b\x93\x20\xd3\x6e\xbf\x63\xbe\x56\x81\x71\x96\xee\x04\xb0\x68\x0e\xf5\xa6\xc9\x69\xc1\xd2\xba\x6b\x96\x44\x40\x28\x31\xf3\xaa\xce\x69\x8d\x59\x2b\xcb\xb6\xd9\xa6\x8f\xba\xb3\xf4\xc3\xd5\x2d\x03\xae\x9a\xf9\xbe\xda\x14\x06\x30\xa3\x11\xde\xe7\x9b\xaa\x80\xbc\xd6\xad\x2c\x14\x9c\x96\x55\x09\x2e\x8b\xa6\x85\x50\xe0\xd1\x58\xc5\x13\xd2\xaLine truncated var _conf_locale_locale_en_us_ini = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xdd\x92\xdb\x38\xb2\xe6\x3d\x9f\x82\xdd\x1b\x5e\xbb\x23\xca\x72\xcc\x4c\xc4\xc6\x46\x87\xed\x8e\xea\x72\xfb\x67\x8e\xcb\x55\xc7\x55\x9e\xd9\xb3\x0e\x07\x87\x12\x29\x89\xa7\x24\x52\x43\x52\xa5\xd6\x5c\xed\x6b\xec\xeb\xed\x93\x6c\x7e\xf9\x83\x1f\x92\x2a\xdb\x73\x36\xf6\xdc\x54\x81\x40\x02\x48\x24\x12\x89\xcc\x44\x02\xca\x77\xbb\xac\x28\xbb\x45\xfa\x22\x3d\x4f\x77\x79\x55\x6f\xca\xae\x4b\xbb\x72\xb3\x7c\xba\x6e\xba\xbe\x2c\xd2\x37\x55\x4f\xdf\xed\x7d\xb5\x28\x93\x64\xdd\x6c\x4b\x02\x7d\x4b\xff\x92\x22\xef\xd6\xf3\x26\x6f\x0b\xca\x78\x65\xe9\xa4\xfc\x7d\xb7\x69\x5a\x00\xfd\x26\xa9\x64\x5d\x6e\x76\xa8\x43\xff\x92\xae\x5a\xd5\x59\x55\xd3\xe7\x0d\xa5\xd2\x77\x75\xd2\x35\x8b\x2a\xdf\x64\x41\x01\x67\x58\xf9\xcf\xe9\x1f\xeb\x22\xbd\xe9\xcb\x5d\xfa\xbc\xdb\xe6\x9b\xcd\xcb\xbc\xe3\x2a\x7d\x99\xe6\x8b\x45\xb3\xaf\xfb\xe7\xcf\xa4\x40\x1a\x6f\xf6\xbd\xb5\x7e\xb5\xef\x25\x6f\xbf\xb3\xac\x4f\xbb\xa4\x2d\x57\x15\x0d\xac\xa5\xac\x8f\x9a\x4c\x0e\xe5\xbc\xab\x7a\x20\xfd\x57\x49\x25\xf7\x65\xdb\x55\x0d\xf0\xf9\x8b\xa4\x92\x5d\xbe\x02\xc0\x35\xfd\x4b\xfa\x72\xbb\xdb\xe4\x5c\xe1\x56\x93\xc9\x26\xaf\x57\x7b\x81\x79\xaf\xc9\x24\xd9\x13\xe5\xea\x9c\x69\xf6\x49\x93\x49\xb9\xcd\xab\x0d\xe8\xf3\x14\x09\x6a\xb7\xeb\x0e\x0d\x53\xf1\x5a\x93\x84\x63\xd6\x1f\x77\x25\xa3\xf8\xf4\x96\x52\xc9\x22\xdf\xf5\x8b\x75\x4e\x39\x17\x92\x4a\x08\x68\xd7\x10\xae\x4d\x7b\x64\x38\xfb\x48\x9a\x76\x95\xd7\xd5\x3f\xf2\x5e\xf0\xbf\x0a\x3e\x93\x6d\xd5\xb6\x0d\x86\x7e\xc9\x89\xa4\x2e\x0f\x19\xda\xa1\x9c\x0f\xe5\x21\x6c\x05\x25\xdb\x6a\xd5\xca\x28\x51\x78\xc9\x5f\x68\x05\x65\xcb\xa6\xbd\xd3\x82\xd7\x48\x0e\xaa\x12\x12\x5a\x1a\xf7\x9f\xd7\x44\x17\x2d\xbd\xe4\x8f\x08\xa0\x4b\xf2\x62\x5b\xd5\xd9\x2e\xaf\x4b\xd0\xe8\x1c\x5f\x44\x17\xfa\x4a\x74\xba\xb3\xae\xec\xfb\xaa\x5e\x75\x28\x96\xac\xf4\x46\xb3\x92\xa0\xcc\xe5\x01\x9f\x2e\x5b\x96\x65\x21\x18\x75\xe9\x6b\x4a\x27\xbb\xfd\x66\x43\x63\xff\xfb\xbe\xec\x7a\xc0\x5f\xd3\x37\x8d\x42\xbe\x93\xaa\xeb\x28\x41\xd9\xef\x38\x91\xd0\x04\xd4\x0b\x46\xe9\x82\x13\x49\xf2\xb9\x2b\xf3\x76\xb1\xfe\x92\xc8\x7f\xee\x11\x89\xd9\x6c\x76\x72\x6a\xc0\x0e\xca\x0a\xd2\x83\x75\x90\x2c\x9a\x02\x1f\x17\xf4\x8f\x9a\xae\xea\xae\x27\x96\xfe\x92\x68\x02\x60\x92\x12\x32\xf6\x55\xbf\x29\x7d\x26\xaf\x8f\x0e\xf3\x90\xbe\xae\xda\xae\x7f\xda\x57\xc4\x72\x1f\xf7\x75\x82\xf1\x11\x3b\x67\xc5\xdc\x56\xf9\x9b\x86\xa8\xc3\xd9\x2d\x8d\xef\xf2\x78\xf3\xaf\xef\xcf\xd2\x6b\x5a\xea\xab\xb6\xa4\x74\x4a\x6d\xd0\x3f\xaa\xf3\xa7\x59\x42\xb5\x94\x0d\x5f\xe5\x7d\x3e\xcf\xbb\x32\x65\x66\x84\x64\x60\x29\xd0\xf5\xd1\x90\xa6\x58\x99\xda\xd0\x05\xe0\xda\xf8\x80\x55\x40\xf9\x10\x0c\x5c\xf9\x7a\x53\x22\x9f\x9a\x4a\xdf\x7d\xf8\x70\xf5\xea\xd7\xb4\xac\x57\x55\x5d\xa6\x87\xaa\x5f\xa7\xfb\x7e\xf9\xdf\xb3\x55\x59\x97\x2d\xc9\x89\x45\x95\x12\xf3\xb7\x34\xcf\x29\x71\xa0\xe0\x3f\x4b\xba\x6e\x93\x6d\x85\x82\x37\x37\xef\xd3\x4b\x50\x71\x97\xf7\x6b\x46\xa4\x5f\x27\xdd\xdf\x37\xa0\x82\xeb\xf0\x76\x5d\xa6\xcb\x8a\x48\xc8\x40\xcd\xd2\x86\x9c\x16\x8a\xe3\x2c\xb1\x0e\x8d\xd4\x6f\xe4\xdb\xb1\x15\x6a\x81\x96\x3c\xd7\x99\x76\xe6\xa7\x3a\xfd\xd8\x34\xbd\x74\xee\x00\x7c\xff\xe7\x34\x67\x90\xab\x6d\xb9\x6d\x68\x7d\x39\x76\xa9\x68\x4a\x0e\x15\x15\xce\xcb\xb4\xcb\xef\x89\x63\xfb\x26\xed\xd7\x55\x97\x16\x34\x5d\x0b\x34\x4c\xcc\xb5\x27\x89\x26\x54\xa7\x29\x16\xca\x5b\x5e\x3c\x44\x86\xda\xee\x69\xb2\xd6\xd4\x18\xe4\x25\x84\x3b\x35\x39\x85\x67\x9a\x93\xa0\xa5\x76\x78\x54\x34\xf7\x0d\x49\x27\xc8\x8f\x57\x9c\xd0\xef\xb0\x7d\xc2\x2a\x5f\x2e\x09\xab\x8e\x88\xfe\x36\x5d\x6c\x1a\x9a\xb1\x4f\x1f\xdf\x53\xe5\x75\xdf\xef\xb2\x5d\xd3\x32\x97\xdc\xde\x5e\x13\x83\xb5\xbd\xcf\x0d\x66\x1e\x30\xf5\x7e\x3b\xa7\xaf\xc3\xba\xa2\x65\x44\x1b\xd2\xa6\x5a\x88\xf0\x62\x52\x6c\x20\xa2\xeb\xb4\xa9\x67\x09\x36\xab\x7d\xcb\x72\x21\x80\xa2\x2e\xad\xe4\x04\x7a\x40\xe1\x19\xfe\xdc\x78\x2c\x79\xb8\x1d\xed\x63\x87\x75\x49\xdb\x15\x0d\xb5\x64\x79\x3c\x13\xf9\xec\xe6\x5d\xa4\x34\x4d\x3b\xef\x80\x7e\xfa\x9f\x5c\xed\xd0\x7b\xbe\xf9\x29\xe9\xb6\x34\x2e\x5d\x13\x37\x97\x34\x5a\x5e\x18\xa8\x46\x13\xa2\x33\x75\x53\xd6\x05\x25\x54\xe6\x6b\x59\xb0\x5e\xb4\xdc\x2d\x9b\xba\xe9\xab\xe5\xd1\x61\xf1\x01\x9f\x36\xe0\x29\x1c\x6c\x57\xcb\x16\x4d\xbd\xac\xda\x2d\x30\xaf\xf3\x39\x55\xb6\x4d\x8e\x64\x0b\x97\x98\x20\xa6\x31\x4a\x27\x1e\xf4\x12\x23\x0d\xbb\x52\x69\x6c\x58\x88\x34\x1e\x09\x5d\x01\x1a\x6e\x73\x26\xc8\xc7\x22\x41\x51\x0c\xcb\x14\x37\x0f\x23\xb5\x07\x5b\xa5\x4a\xc3\x6c\xd5\xb0\x84\x37\xe9\xc7\xcb\xb0\x27\xb1\x9d\xad\xaa\x3e\x5b\x82\xb6\x68\xf3\x35\xea\x62\xfd\x50\x49\xfa\x98\x8a\x1e\xa7\x8b\x66\x4b\x3b\x50\xf1\x73\xfa\xe8\x5e\x65\xc2\x9f\x40\x84\x2c\xbf\x27\x58\x26\xc1\x8b\xf4\xdf\x9a\x7d\x4b\x2b\x52\x44\x92\xa9\x01\x45\x43\x2b\x93\x20\xd3\x6e\xbf\x63\xbe\x56\x81\x71\x96\xee\x04\xb0\x68\x0e\xf5\xa6\xc9\x69\xc1\xd2\xba\x6b\x96\x44\x40\x28\x31\xf3\xaa\xce\x69\x8d\x59\x2b\xcb\xb6\xd9\xa6\x8f\xba\xb3\xf4\xc3\xd5\x2d\x03\xae\x9a\xf9\xbe\xda\x14\x06\x30\xa3\x11\xde\xe7\x9b\xaa\x80\xbc\xd6\xad\x2c\x14\x9c\x96\x55\x09\x2e\x8b\xa6\x85\x50\xe0\xd1\x58\xc5\x13\xd2\xaLine truncated
func conf_locale_locale_en_us_ini_bytes() ([]byte, error) { func conf_locale_locale_en_us_ini_bytes() ([]byte, error) {
return bindata_read( return bindata_read(
@@ -596,7 +596,7 @@ func conf_locale_locale_en_us_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_en-US.ini", size: 31704, mode: os.FileMode(420), modTime: time.Unix(1429866527, 0)} info := bindata_file_info{name: "conf/locale/locale_en-US.ini", size: 31746, mode: os.FileMode(420), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -616,7 +616,7 @@ func conf_locale_locale_es_es_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_es-ES.ini", size: 35103, mode: os.FileMode(493), modTime: time.Unix(1429881508, 0)} info := bindata_file_info{name: "conf/locale/locale_es-ES.ini", size: 35103, mode: os.FileMode(493), modTime: time.Unix(1435901865, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -636,7 +636,7 @@ func conf_locale_locale_fr_fr_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_fr-FR.ini", size: 34457, mode: os.FileMode(493), modTime: time.Unix(1429881506, 0)} info := bindata_file_info{name: "conf/locale/locale_fr-FR.ini", size: 34457, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -656,7 +656,7 @@ func conf_locale_locale_ja_jp_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_ja-JP.ini", size: 38690, mode: os.FileMode(493), modTime: time.Unix(1429881508, 0)} info := bindata_file_info{name: "conf/locale/locale_ja-JP.ini", size: 38690, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -676,7 +676,7 @@ func conf_locale_locale_lv_lv_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_lv-LV.ini", size: 35101, mode: os.FileMode(493), modTime: time.Unix(1429881516, 0)} info := bindata_file_info{name: "conf/locale/locale_lv-LV.ini", size: 35101, mode: os.FileMode(493), modTime: time.Unix(1435901865, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -696,7 +696,7 @@ func conf_locale_locale_nl_nl_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_nl-NL.ini", size: 32903, mode: os.FileMode(493), modTime: time.Unix(1429881510, 0)} info := bindata_file_info{name: "conf/locale/locale_nl-NL.ini", size: 32903, mode: os.FileMode(493), modTime: time.Unix(1435901865, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -716,7 +716,7 @@ func conf_locale_locale_pl_pl_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_pl-PL.ini", size: 33353, mode: os.FileMode(493), modTime: time.Unix(1429881510, 0)} info := bindata_file_info{name: "conf/locale/locale_pl-PL.ini", size: 33353, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -736,7 +736,7 @@ func conf_locale_locale_pt_br_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_pt-BR.ini", size: 33741, mode: os.FileMode(493), modTime: time.Unix(1429881514, 0)} info := bindata_file_info{name: "conf/locale/locale_pt-BR.ini", size: 33741, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -756,7 +756,7 @@ func conf_locale_locale_ru_ru_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_ru-RU.ini", size: 46557, mode: os.FileMode(493), modTime: time.Unix(1429881510, 0)} info := bindata_file_info{name: "conf/locale/locale_ru-RU.ini", size: 46557, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -776,7 +776,7 @@ func conf_locale_locale_zh_cn_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_zh-CN.ini", size: 31098, mode: os.FileMode(493), modTime: time.Unix(1429881512, 0)} info := bindata_file_info{name: "conf/locale/locale_zh-CN.ini", size: 31098, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@@ -796,7 +796,7 @@ func conf_locale_locale_zh_hk_ini() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "conf/locale/locale_zh-HK.ini", size: 31269, mode: os.FileMode(493), modTime: time.Unix(1429881512, 0)} info := bindata_file_info{name: "conf/locale/locale_zh-HK.ini", size: 31269, mode: os.FileMode(493), modTime: time.Unix(1435902099, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
modules/mailer/mailer.go
+11 -6
View File
@@ -104,13 +104,18 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
return err return err
} }
hostname, err := os.Hostname() if !setting.MailService.DisableHelo {
if err != nil { hostname := setting.MailService.HeloHostname
return err if len(hostname) == 0 {
} hostname, err = os.Hostname()
if err != nil {
return err
}
}
if err = client.Hello(hostname); err != nil { if err = client.Hello(hostname); err != nil {
return err return err
}
} }
// If not using SMTPS, alway use STARTTLS if available // If not using SMTPS, alway use STARTTLS if available
modules/setting/setting.go
+4
View File
@@ -478,6 +478,8 @@ type Mailer struct {
Host string Host string
From string From string
User, Passwd string User, Passwd string
DisableHelo bool
HeloHostname string
SkipVerify bool SkipVerify bool
UseCertificate bool UseCertificate bool
CertFile, KeyFile string CertFile, KeyFile string
@@ -512,6 +514,8 @@ func newMailService() {
Host: sec.Key("HOST").String(), Host: sec.Key("HOST").String(),
User: sec.Key("USER").String(), User: sec.Key("USER").String(),
Passwd: sec.Key("PASSWD").String(), Passwd: sec.Key("PASSWD").String(),
DisableHelo: sec.Key("DISABLE_HELO").MustBool(),
HeloHostname: sec.Key("HELO_HOSTNAME").String(),
SkipVerify: sec.Key("SKIP_VERIFY").MustBool(), SkipVerify: sec.Key("SKIP_VERIFY").MustBool(),
UseCertificate: sec.Key("USE_CERTIFICATE").MustBool(), UseCertificate: sec.Key("USE_CERTIFICATE").MustBool(),
CertFile: sec.Key("CERT_FILE").String(), CertFile: sec.Key("CERT_FILE").String(),
templates/.VERSION
+1 -1
View File
@@ -1 +1 @@
0.6.1.0327 Beta 0.6.1.0703 Beta