Merge pull request #589 from paskal/blackfriday

Replace blackfriday.v2 with blackfriday/v2

backend/_example/memory_store/go.mod

@@ -12,5 +12,3 @@ require (
 )
 
 replace github.com/umputun/remark/backend => ../../
-
-replace gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2 v2.0.1

backend/app/store/formatter.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/PuerkitoBio/goquery"
-	bf "gopkg.in/russross/blackfriday.v2"
+	bf "github.com/russross/blackfriday/v2"
 )
 
 // CommentFormatter implements all generic formatting ops on comment

backend/go.mod

@@ -2,8 +2,6 @@ module github.com/umputun/remark/backend
 
 go 1.13
 
-replace gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2 v2.0.1
-
 require (
 	cloud.google.com/go v0.47.0 // indirect
 	github.com/PuerkitoBio/goquery v1.5.0
@@ -43,6 +41,7 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/rakyll/statik v0.1.6
 	github.com/rs/xid v1.2.1
+	github.com/russross/blackfriday/v2 v2.0.1
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/smartystreets/assertions v1.0.1 // indirect
 	github.com/stretchr/objx v0.2.0 // indirect
@@ -61,6 +60,5 @@ require (
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	google.golang.org/appengine v1.6.5 // indirect
 	gopkg.in/oauth2.v3 v3.11.0 // indirect
-	gopkg.in/russross/blackfriday.v2 v2.0.1
 	gopkg.in/yaml.v2 v2.2.4 // indirect
 )

backend/vendor/modules.txt

@@ -92,6 +92,8 @@ github.com/pmezard/go-difflib/difflib
 github.com/rakyll/statik/fs
 # github.com/rs/xid v1.2.1
 github.com/rs/xid
+# github.com/russross/blackfriday/v2 v2.0.1
+github.com/russross/blackfriday/v2
 # github.com/shurcooL/sanitized_anchor_name v1.0.0
 github.com/shurcooL/sanitized_anchor_name
 # github.com/stretchr/objx v0.2.0
@@ -182,7 +184,5 @@ google.golang.org/appengine/urlfetch
 gopkg.in/oauth2.v3
 gopkg.in/oauth2.v3/errors
 gopkg.in/oauth2.v3/server
-# gopkg.in/russross/blackfriday.v2 v2.0.1 => github.com/russross/blackfriday/v2 v2.0.1
-gopkg.in/russross/blackfriday.v2
 # gopkg.in/yaml.v2 v2.2.4
 gopkg.in/yaml.v2