فهرست منبع

Fix do-not-reply message in mail notifications

Achilleas Koutsou 4 سال پیش
والد
کامیت
b29144cc2a

+ 12 - 12
internal/assets/templates/templates_gen.go

@@ -40,9 +40,9 @@
 // ../../../templates/mail/auth/invite_email.tmpl (985B)
 // ../../../templates/mail/auth/register_notify.tmpl (500B)
 // ../../../templates/mail/auth/reset_passwd.tmpl (621B)
-// ../../../templates/mail/issue/comment.tmpl (384B)
-// ../../../templates/mail/issue/mention.tmpl (430B)
-// ../../../templates/mail/notify/collaborator.tmpl (391B)
+// ../../../templates/mail/issue/comment.tmpl (385B)
+// ../../../templates/mail/issue/mention.tmpl (431B)
+// ../../../templates/mail/notify/collaborator.tmpl (444B)
 // ../../../templates/org/create.tmpl (981B)
 // ../../../templates/org/header.tmpl (938B)
 // ../../../templates/org/home.tmpl (3.338kB)
@@ -1026,7 +1026,7 @@ func mailAuthReset_passwdTmpl() (*asset, error) {
 	return a, nil
 }
 
-var _mailIssueCommentTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x34\x90\x41\x6f\xa3\x30\x10\x85\xcf\xf8\x57\xcc\x72\x07\x4b\x7b\x5a\x69\x0d\x87\xa6\x55\x5b\x29\x6d\x23\x05\x55\xea\xd1\xc0\x44\x4c\x63\x3c\x14\x86\x24\x88\xf2\xdf\x2b\x83\x7a\xf2\x8c\xfd\xbd\xf7\xf4\x6c\xfe\xdc\xbf\xed\x8a\x8f\xc3\x03\x34\xd2\xba\x5c\x99\xdf\x03\x6d\x9d\xab\xc8\xb4\x28\x16\x1a\x91\x2e\xc1\xaf\x91\x2e\x59\xbc\x63\x2f\xe8\x25\x29\xa6\x0e\x63\xa8\xb6\x2d\x8b\x05\x6f\xa2\x83\xf6\x3f\x54\x8d\xed\x07\x94\x6c\x94\x53\xf2\x2f\x06\x1d\x6c\x84\xc4\x61\x3e\xcf\xe9\x71\x2c\x3f\xb1\x92\x65\x31\x7a\xbb\x53\x46\x6f\x59\xca\x94\x5c\x4f\x01\xee\x02\x78\xc7\xf5\x04\xdf\x70\x94\xfe\xef\x53\xf1\xb2\x0f\x82\x6e\x7b\x54\x51\x94\x24\x89\x8a\x22\x53\xf6\x61\x31\x94\x1f\x1c\xda\x01\xa1\x66\xf0\x2c\xd0\x63\xe7\x26\x10\x06\x69\x68\x00\x6c\x2d\xb9\x14\x8a\x30\x87\xb1\xe4\x1b\xd0\xb0\x82\x2d\x7b\x12\xee\xb1\x4e\x61\xe7\xa8\x3a\x83\x34\x08\x8e\xfc\x19\x6c\xc9\x17\x84\x12\x1d\x5f\x83\x51\xc5\x6d\x8b\x5e\x80\xfd\x8a\xd0\x30\x8c\x98\x1a\x4d\x6b\xbc\x85\xa6\xc7\x53\x16\xcf\x73\xba\x27\x7f\x5e\x96\x38\x7f\x27\xbc\x02\xad\xfc\xe3\xf3\xab\xd1\x36\x4f\x55\xb4\x16\x30\x7a\x6b\x69\xf4\xf6\xd1\x3f\x01\x00\x00\xff\xff\xc7\xe7\xb0\x8b\x80\x01\x00\x00"
+var _mailIssueCommentTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x4c\x50\xcd\x4e\x84\x30\x10\x3e\xd3\xa7\x18\xb9\x43\x13\x4f\x26\x96\x1e\x5c\x8d\x9a\xac\xba\xc9\x12\x13\x8f\x05\x66\xc3\x48\x69\x11\x06\x77\x09\xf2\xee\xa6\x10\x13\x4f\x9d\xe9\xf7\x97\x6f\xd4\xd5\xfd\xdb\x2e\xff\x38\x3c\x40\xcd\xad\xd5\x42\xfd\x3d\x68\x2a\x2d\x22\xd5\x22\x1b\xa8\x99\xbb\x04\xbf\x46\xfa\xce\xe2\x9d\x77\x8c\x8e\x93\x7c\xea\x30\x86\x72\xdb\xb2\x98\xf1\xc2\x32\x68\x6f\xa1\xac\x4d\x3f\x20\x67\x23\x9f\x92\x9b\x18\x64\xb0\x61\x62\x8b\x7a\x9e\xd3\xe3\x58\x7c\x62\xc9\xcb\xa2\xe4\xf6\x27\x94\xdc\xb2\x84\x2a\x7c\x35\x05\x72\x17\x88\x77\xbe\x9a\xe0\x07\x8e\xdc\x5f\x3f\xe5\x2f\xfb\x20\xe8\x36\x50\x44\x51\x92\x24\x22\x8a\x54\xd1\x87\x45\x91\x3e\x58\x34\x03\x42\xe5\xc1\x79\x86\x1e\x3b\x3b\x01\x7b\xe0\x9a\x06\xc0\xd6\x90\x4d\x21\x0f\x73\x18\x0b\x7f\x01\x1a\x56\x62\xeb\x1d\xb1\xef\xb1\x4a\x61\x67\xa9\x6c\x80\x6b\x04\x4b\xae\x81\x02\xad\x3f\x07\x8b\xd2\xb7\x2d\x3a\x06\xef\x56\x90\x86\x61\xc4\x54\x49\xd2\xff\xf2\x0d\xd4\x3d\x9e\xb2\x78\x9e\xd3\x3d\xb9\x66\x59\x62\xfd\x4e\x78\x06\x5a\x65\x8f\xcf\xaf\x4a\x1a\x9d\x8a\x68\x6d\xa0\xe4\x56\x53\xc9\xed\xd2\xbf\x01\x00\x00\xff\xff\xa3\xc9\x10\x50\x81\x01\x00\x00"
 
 func mailIssueCommentTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -1041,12 +1041,12 @@ func mailIssueCommentTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "mail/issue/comment.tmpl", size: 384, mode: os.FileMode(0664), modTime: time.Unix(1607017394, 0)}
-	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x84, 0xc5, 0x33, 0x4e, 0x73, 0x61, 0x95, 0x17, 0x88, 0xb6, 0x5f, 0x43, 0x80, 0x12, 0xf3, 0x72, 0x8, 0x9c, 0x66, 0xf5, 0xec, 0x8c, 0xcc, 0x31, 0x56, 0x80, 0xa0, 0x8a, 0x20, 0xe6, 0xf5, 0x7e}}
+	info := bindataFileInfo{name: "mail/issue/comment.tmpl", size: 385, mode: os.FileMode(0664), modTime: time.Unix(1607017473, 0)}
+	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x37, 0xc4, 0x73, 0xf3, 0xaa, 0xc0, 0xcd, 0x6a, 0x41, 0xb9, 0xe2, 0x63, 0x64, 0xc3, 0x80, 0x75, 0x5c, 0x40, 0x8e, 0xf, 0x92, 0x84, 0xe8, 0x5c, 0x3, 0xe1, 0xa5, 0x87, 0x3b, 0x86, 0x2f, 0xf6}}
 	return a, nil
 }
 
-var _mailIssueMentionTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x34\x91\xcf\xce\x94\x30\x14\xc5\xd7\xf0\x14\x57\xf6\xb4\x89\x2b\xa3\x85\x18\x67\x8c\x9a\x7c\x8e\x93\x0c\x31\x71\x59\xe0\x4e\xb8\x4e\xe9\x45\xb8\xcc\x0c\xa9\xbc\xbb\x29\xf8\xad\x7a\x4e\xfb\xeb\x39\xfd\x63\xde\x1c\x7f\x1c\xaa\x5f\xe7\xcf\xd0\x49\xef\xca\xd4\xbc\x0e\x68\xdb\x32\x4d\x4c\x8f\x62\xa1\x13\x19\x72\xfc\x33\xd3\xbd\xc8\x0e\xec\x05\xbd\xe4\xd5\x32\x60\x06\xcd\xee\x8a\x4c\xf0\x29\x3a\xee\xfd\x00\x4d\x67\xc7\x09\xa5\x98\xe5\x9a\xbf\xcb\x40\xc7\x18\x21\x71\x58\x86\xa0\x2e\x73\xfd\x1b\x1b\x59\x57\xa3\xf7\xb9\xd4\xe8\xbd\x2b\x35\x35\xb7\x4b\x84\x87\xf2\x63\x08\xea\xc8\x38\xaa\x23\x4d\x83\xb3\xcb\xc9\xf6\xb8\xae\xd0\xa3\x17\x62\x8f\x2d\x2c\x3c\xbf\x37\x7a\xd8\xe9\x10\xd4\x27\x6e\x17\xf8\x0b\x17\x19\xdf\x7e\xad\xbe\xbf\xc4\xf8\xff\x8b\x69\x92\xe4\x79\x9e\x26\x89\xa9\xc7\x68\x0c\x95\x67\x87\x76\x42\x68\x19\x3c\x0b\x8c\x38\xb8\x05\x84\x41\x3a\x9a\x00\x7b\x4b\x4e\x41\x15\x75\x94\x35\x3f\x81\xa6\x0d\xec\xd9\x93\xf0\x88\xad\x82\x83\xa3\xe6\x06\xd2\x21\x38\xf2\x37\xb0\x35\xdf\x11\x6a\x74\xfc\x88\x41\x0d\xf7\xf1\xa4\xc0\x7e\x43\x68\x9a\x66\x54\x46\xd3\x56\x6f\xa1\x1b\xf1\x5a\x64\x21\xa8\x17\xf2\xb7\x75\xcd\xca\x9f\x84\x0f\xa0\x8d\xff\xf2\xed\x64\xb4\x2d\x55\x9a\x6c\x17\x30\x7a\x7f\x13\xa3\xf7\x6f\xf9\x17\x00\x00\xff\xff\x18\xb7\x19\xf0\xae\x01\x00\x00"
+var _mailIssueMentionTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x4c\x51\xcd\x8e\x9b\x30\x10\x3e\xc3\x53\x4c\xb9\x63\x4b\x3d\x55\xad\xb1\xaa\x26\x55\x5b\x29\x4d\x23\x05\x55\xda\xa3\x81\x89\x98\x8d\xb1\x59\x18\x36\x41\x5e\xde\x7d\x65\xd8\x95\xf6\xe4\xf9\xfc\xfd\xf9\x47\x7d\xda\xff\xdb\x95\x0f\xa7\x9f\xd0\x72\x67\x75\xaa\xde\x17\x34\x8d\x4e\x13\xd5\x21\x1b\x68\x99\xfb\x1c\x9f\x26\x7a\x2e\xb2\x9d\x77\x8c\x8e\xf3\x72\xee\x31\x83\x7a\x43\x45\xc6\x78\x67\x19\xbd\xdf\xa0\x6e\xcd\x30\x22\x17\x13\x5f\xf2\x2f\x19\xc8\x18\xc3\xc4\x16\x75\x08\xe2\x3c\x55\x8f\x58\xf3\xb2\x28\xb9\xed\xa5\x4a\x6e\x5d\xa9\xaa\x7c\x33\x47\x71\xaf\xbf\x87\x20\xf6\x1e\x07\xb1\xa7\xb1\xb7\x66\x3e\x9a\x0e\x97\x05\x3a\x74\x4c\xde\x61\x03\xb3\x9f\xbe\x2a\xd9\x6f\xea\x10\xc4\x0f\xdf\xcc\xf0\x02\x67\x1e\x3e\xff\x2e\xff\x1e\x62\xfc\x1b\x99\x26\x49\x9e\xe7\x69\x92\xa8\x6a\x88\x40\x91\x3e\x59\x34\x23\x42\xe3\xc1\x79\x86\x01\x7b\x3b\x03\x7b\xe0\x96\x46\xc0\xce\x90\x15\x50\xc6\x39\x8e\x95\xbf\x03\x8d\xab\xb0\xf3\x8e\xd8\x0f\xd8\x08\xd8\x59\xaa\xaf\xc0\x2d\x82\x25\x77\x85\x0a\xad\xbf\xc5\x88\xda\x77\xf1\x8c\xe0\xdd\x4a\xd2\x38\x4e\x28\x94\x24\xfd\xa1\xdf\x40\x3b\xe0\xa5\xc8\x42\x10\x07\x72\xd7\x65\xc9\xf4\x7f\xc2\x1b\xd0\x6a\xfb\xf5\xe7\xa8\xa4\xd1\x22\x4d\xd6\x1b\x28\xb9\x3d\x8a\x92\xdb\xbf\xbc\x06\x00\x00\xff\xff\xb6\xaf\x07\x46\xaf\x01\x00\x00"
 
 func mailIssueMentionTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -1061,12 +1061,12 @@ func mailIssueMentionTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "mail/issue/mention.tmpl", size: 430, mode: os.FileMode(0664), modTime: time.Unix(1607017394, 0)}
-	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x60, 0x97, 0x43, 0x73, 0x4, 0x7c, 0x1c, 0xc7, 0x3e, 0x94, 0xe1, 0x41, 0x9c, 0x77, 0x90, 0xf, 0xcc, 0x1, 0xe0, 0xee, 0x32, 0x6b, 0xd2, 0x74, 0xc4, 0x80, 0x60, 0xa4, 0xed, 0xf2, 0x7c, 0x16}}
+	info := bindataFileInfo{name: "mail/issue/mention.tmpl", size: 431, mode: os.FileMode(0664), modTime: time.Unix(1607017473, 0)}
+	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb4, 0xb7, 0x7e, 0x51, 0x65, 0x23, 0x92, 0x39, 0xd7, 0x4d, 0xf6, 0x72, 0x79, 0xf0, 0xa3, 0xdf, 0xab, 0xf5, 0x9a, 0x19, 0x3b, 0xd7, 0x5f, 0x84, 0xba, 0xaf, 0xbd, 0xed, 0x24, 0x77, 0xa, 0x79}}
 	return a, nil
 }
 
-var _mailNotifyCollaboratorTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x34\x90\x41\x4f\xb4\x30\x10\x86\xcf\xf0\x2b\xe6\xe3\x0e\xbd\x7e\xd1\x81\xcb\x6a\xbc\x18\xdd\xe8\xc6\x64\x8f\x03\x9d\x0d\x55\xe8\x60\x19\xd6\x25\x84\xff\x6e\x0a\xf1\xd4\x99\xc9\xdb\xe7\x69\x07\xff\x3d\xbc\x1e\x4e\xe7\xe3\x23\xb4\xda\x77\x55\x8a\x7f\x07\x93\xad\xd2\x04\x7b\x56\x82\x56\x75\xc8\xf9\x7b\x72\xd7\x32\x3b\x88\x57\xf6\x9a\x9f\xe6\x81\x33\x68\xf6\xae\xcc\x94\x6f\x6a\xe2\xdd\x7b\x68\x5a\x0a\x23\x6b\x39\xe9\x25\xff\x9f\x81\x89\x18\x75\xda\x71\xb5\x2c\xc5\xfb\x54\x7f\x72\xa3\xeb\x8a\x66\x9f\xa5\x68\x76\x57\x8a\xb5\xd8\x39\x86\x87\xea\x2c\x13\xb4\x74\x65\xa8\x99\x3d\x90\xb5\x6c\x81\x46\x20\x68\xa4\xeb\xa8\x96\x40\x2a\x01\xe4\x02\x81\x07\x19\x9d\x4a\x98\xef\x00\x1b\xb1\x9b\xe3\x8d\x07\x79\xa1\x9e\xa3\x64\x9b\xa1\x19\x76\x6e\x9a\x24\x79\x9e\xa7\x49\x82\x75\x88\x0d\xba\xea\xd8\x31\x8d\x0c\x56\xc0\x8b\x46\x5e\x37\x83\x0a\x68\xeb\x46\xe0\x9e\x5c\x57\xc0\x29\xd6\xb1\xac\xe5\x06\x6e\xdc\x82\xbd\xf8\xa8\x65\x5b\xa0\x71\x1b\x8a\xa0\x0d\x7c\x29\xb3\x65\x29\x9e\x9d\xff\x5a\xd7\xac\xfa\x70\xfc\x03\x4e\x41\x3c\x3c\x39\x8f\x86\xaa\x22\x4d\xb6\xc7\xa0\xd9\x3f\x8b\x66\xdf\xf7\x6f\x00\x00\x00\xff\xff\x22\x9c\xd9\x94\x87\x01\x00\x00"
+var _mailNotifyCollaboratorTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x4c\x91\x41\x6b\xeb\x30\x0c\x80\xcf\xc9\xaf\xd0\xcb\x3d\xf1\xf5\xf1\x9e\xe3\x4b\x37\xc6\x60\x74\x65\x2b\x83\x1e\x9d\x58\x25\x5e\x1d\x2b\xb3\x95\xb6\x21\xe4\xbf\x0f\x27\x0c\x76\xb2\x24\x4b\xdf\x87\x2d\xf9\xe7\xe1\x75\x77\x3c\x1d\x1e\xa1\xe3\xde\xa9\x5c\xfe\x1c\xa8\x8d\xca\x33\xd9\x23\x6b\xe8\x98\x87\x12\xbf\x46\x7b\xad\x8b\x1d\x79\x46\xcf\xe5\x71\x1a\xb0\x80\x76\xcb\xea\x82\xf1\xce\x22\xcd\xfe\x87\xb6\xd3\x21\x22\xd7\x23\x9f\xcb\xbf\x05\x88\x84\x61\xcb\x0e\xd5\x3c\x57\xef\x63\xf3\x89\x2d\x2f\x8b\x14\x5b\x2d\x97\x62\x73\xe5\xb2\x21\x33\xa5\xe6\x41\x9d\x68\x84\x4e\x5f\x11\x1a\x44\x0f\xda\x18\x34\xa0\x23\x68\x68\xc9\x39\xdd\x50\xd0\x4c\x01\xe8\x0c\x01\x07\x8a\x96\x29\x4c\xff\x40\xb6\x64\x56\xc7\x1b\x0e\xb4\xd7\x3d\x26\xc9\x5a\x93\x62\xd8\xb8\x79\x96\x95\x65\x99\x67\x99\x6c\x42\x4a\xa4\x55\x07\x87\x3a\x22\x18\x02\x4f\x9c\x78\x6e\x02\x26\xe0\xce\x46\xc0\x5e\x5b\x57\xc1\x31\xc5\x29\x6c\xe8\x0e\x36\xae\x8d\x3d\xf9\xa4\x45\x53\xc1\xce\xd9\xf6\x02\xdc\x21\x38\xeb\x2f\xd0\xa0\xa3\x5b\x42\xb4\xd4\xf7\xe8\x19\xc8\xaf\x97\x36\xc6\x11\x2b\x29\xac\xfa\xe5\xd7\xd0\x05\x3c\xd7\xc5\x3c\x57\x2f\xd6\x5f\x96\xa5\x50\x1f\x16\x6f\x60\xd7\xb1\xa7\xe7\xbd\x14\x5a\x55\x79\xb6\xbe\x40\x8a\xed\x87\xa4\xd8\x96\xf4\x1d\x00\x00\xff\xff\xe3\x41\x89\x49\xbc\x01\x00\x00"
 
 func mailNotifyCollaboratorTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -1081,8 +1081,8 @@ func mailNotifyCollaboratorTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "mail/notify/collaborator.tmpl", size: 391, mode: os.FileMode(0664), modTime: time.Unix(1607017394, 0)}
-	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xfd, 0xe6, 0x4c, 0x5f, 0xec, 0xd2, 0x95, 0x50, 0xda, 0xb8, 0xf9, 0xc, 0x3e, 0x66, 0xdc, 0x38, 0x1e, 0xa8, 0x15, 0x1e, 0xf7, 0xa6, 0xdb, 0x4, 0x66, 0xc6, 0xd1, 0x75, 0xe5, 0x93, 0xce, 0x5d}}
+	info := bindataFileInfo{name: "mail/notify/collaborator.tmpl", size: 444, mode: os.FileMode(0664), modTime: time.Unix(1607017473, 0)}
+	a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3a, 0x70, 0x74, 0x5b, 0x5e, 0x31, 0x1e, 0x45, 0xe3, 0xb1, 0x3e, 0x73, 0x63, 0x41, 0x4f, 0x12, 0xd6, 0x2a, 0xf7, 0xc9, 0x40, 0x22, 0xe6, 0x88, 0x25, 0xa9, 0xf8, 0xb1, 0x3a, 0xbb, 0xf7, 0x63}}
 	return a, nil
 }
 

+ 2 - 1
templates/mail/issue/comment.tmpl

@@ -10,7 +10,8 @@
 	<p>
 		---
 		<br>
-		<i>Please do not reply to this email. This mailbox is not monitored. Click the link above below to comment on the issue.</i>
+		<i>Please do not reply to this email. This mailbox is not monitored. Click the link below to comment on the issue.</i>
+		<br>
 		<a href="{{.Link}}">View it on GIN</a>.
 	</p>
 </body>

+ 2 - 1
templates/mail/issue/mention.tmpl

@@ -11,7 +11,8 @@
 	<p>
 		---
 		<br>
-		<i>Please do not reply to this email. This mailbox is not monitored. Click the link above below to comment on the issue.</i>
+		<i>Please do not reply to this email. This mailbox is not monitored. Click the link below to comment on the issue.</i>
+		<br>
 		<a href="{{.Link}}">View it on GIN</a>.
 	</p>
 </body>

+ 3 - 2
templates/mail/notify/collaborator.tmpl

@@ -10,8 +10,9 @@
 	<p>
 		---
 		<br>
-		<i>Please do not reply to this email. This mailbox is not monitored.</i>
-		<a href="{{.Link}}">View it on Gin</a>.
+		<i>Please do not reply to this email. This mailbox is not monitored. Click the link below to comment on the issue.</i>
+		<br>
+		<a href="{{.Link}}">View it on GIN</a>.
 	</p>
 </body>
 </html>