Merge branch 'release/v1.8' into fix-go-gitea#6716-backport-v1.8

zeripath · web-flow · commit 21db6e1c1354 · 2019-04-26T19:18:22.000+01:00
diff --git a/modules/markup/html.go b/modules/markup/html.go
@@ -63,7 +63,7 @@ var (
 	// well as the HTML5 spec:
 	//   http://spec.commonmark.org/0.28/#email-address
 	//   https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type%3Demail)
-	emailRegex = regexp.MustCompile("[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*")
+	emailRegex = regexp.MustCompile("[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+")
 
 	linkRegex, _ = xurls.StrictMatchingScheme("https?://")
 )

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ var (`
`63`	`63`	`// well as the HTML5 spec:`
`64`	`64`	`// http://spec.commonmark.org/0.28/#email-address`
`65`	`65`	`// https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type%3Demail)`
`66`		- emailRegex = regexp.MustCompile("[a-zA-Z0-9.!#$%&'+\\/=?^_`{\|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)")
	`66`	+ emailRegex = regexp.MustCompile("[a-zA-Z0-9.!#$%&'*+\\/=?^_`{\|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+")
`67`	`67`
`68`	`68`	`linkRegex, _ = xurls.StrictMatchingScheme("https?://")`
`69`	`69`	`)`