summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-10-26 22:08:02 +0200
committerGitHub <noreply@github.com>2019-10-26 22:08:02 +0200
commitbad3b83d339b5d3ec8cd69e11ee56e82e23737bb (patch)
treea1070866f50625798c4b8ede945f4530bcccaed7 /vendor
parent00967a98ac918cfdb66a5a1e9dd8af69dd7e2cc7 (diff)
downloadmatterbridge-msglm-bad3b83d339b5d3ec8cd69e11ee56e82e23737bb.tar.gz
matterbridge-msglm-bad3b83d339b5d3ec8cd69e11ee56e82e23737bb.tar.bz2
matterbridge-msglm-bad3b83d339b5d3ec8cd69e11ee56e82e23737bb.zip
Update golang-commonmark/linkify vendor and use upstream again. Fixes #924 (#926)
Diffstat (limited to 'vendor')
-rw-r--r--vendor/gitlab.com/golang-commonmark/linkify/.gitlab-ci.yml2
-rw-r--r--vendor/gitlab.com/golang-commonmark/linkify/url.go2
-rw-r--r--vendor/modules.txt4
3 files changed, 4 insertions, 4 deletions
diff --git a/vendor/gitlab.com/golang-commonmark/linkify/.gitlab-ci.yml b/vendor/gitlab.com/golang-commonmark/linkify/.gitlab-ci.yml
index c873ca36..5e4d0bf2 100644
--- a/vendor/gitlab.com/golang-commonmark/linkify/.gitlab-ci.yml
+++ b/vendor/gitlab.com/golang-commonmark/linkify/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: golang:1.11
+image: golang:1.13
stages:
- build
diff --git a/vendor/gitlab.com/golang-commonmark/linkify/url.go b/vendor/gitlab.com/golang-commonmark/linkify/url.go
index 495a7ac4..b2a21bbd 100644
--- a/vendor/gitlab.com/golang-commonmark/linkify/url.go
+++ b/vendor/gitlab.com/golang-commonmark/linkify/url.go
@@ -88,7 +88,7 @@ loop:
case isUnreserved(r):
if r == '-' {
nHyphen++
- if nHyphen > 1 {
+ if nHyphen > 2 {
break loop
}
} else {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index cb2275b4..4325c2e8 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -191,9 +191,9 @@ github.com/valyala/fasttemplate
github.com/zfjagann/golang-ring
# gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a
gitlab.com/golang-commonmark/html
-# gitlab.com/golang-commonmark/linkify v0.0.0-20180917065525-c22b7bdb1179
+# gitlab.com/golang-commonmark/linkify v0.0.0-20191026162114-a0c2df6c8f82
gitlab.com/golang-commonmark/linkify
-# gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f => github.com/matterbridge/golang-connmark-markdown v0.0.0-20190921222037-3cfbd51464b9
+# gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f
gitlab.com/golang-commonmark/markdown
# gitlab.com/golang-commonmark/mdurl v0.0.0-20180912090424-e5bce34c34f2
gitlab.com/golang-commonmark/mdurl