From fd46ec47925528d456a264e77c1710af311709d4 Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Tue, 14 Aug 2018 17:18:01 -0400 Subject: [PATCH 1/2] removed a rogue blackfriday reference --- Gopkg.toml | 4 ---- go.mod | 1 - go.sum | 2 -- render/template.go | 4 ---- runtime/version.go | 2 +- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Gopkg.toml b/Gopkg.toml index 821952d7a..8515090b6 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -125,10 +125,6 @@ name = "github.com/pkg/errors" version = "0.8.0" -[[constraint]] - name = "github.com/russross/blackfriday" - version = "2.0.0" - [[constraint]] name = "github.com/sirupsen/logrus" version = "1.0.6" diff --git a/go.mod b/go.mod index 428e51520..bb232bfaf 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,6 @@ require ( github.com/pelletier/go-toml v1.2.0 github.com/pkg/errors v0.8.0 github.com/pmezard/go-difflib v1.0.0 - github.com/russross/blackfriday v2.0.0+incompatible github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516 github.com/sergi/go-diff v1.0.0 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e diff --git a/go.sum b/go.sum index a4727f4b9..f7091bd37 100644 --- a/go.sum +++ b/go.sum @@ -99,8 +99,6 @@ github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= -github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516 h1:ofR1ZdrNSkiWcMsRrubK9tb2/SlZVWttAfqUjJi6QYc= github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= diff --git a/render/template.go b/render/template.go index 8cc072cf8..2741733d9 100644 --- a/render/template.go +++ b/render/template.go @@ -10,10 +10,6 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - - // this blank import is here because dep doesn't - // handle transitive dependencies correctly - _ "github.com/russross/blackfriday" ) type templateRenderer struct { diff --git a/runtime/version.go b/runtime/version.go index dc862e489..9e5b4793a 100644 --- a/runtime/version.go +++ b/runtime/version.go @@ -1,6 +1,6 @@ package runtime // Version is the current version of the buffalo binary -const Version = "v0.12.5" +const Version = "v0.12.6" // const Version = "development" From d1b8df27dc86ace226bb9ccec00dd018c697f26b Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Tue, 14 Aug 2018 17:26:13 -0400 Subject: [PATCH 2/2] Updated SHOULDERS.md --- SHOULDERS.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/SHOULDERS.md b/SHOULDERS.md index ff53031ea..bc39b97ef 100644 --- a/SHOULDERS.md +++ b/SHOULDERS.md @@ -158,8 +158,6 @@ Thank you to the following **GIANTS**: * [github.com/pkg/errors](https://godoc.org/github.com/pkg/errors) -* [github.com/russross/blackfriday](https://godoc.org/github.com/russross/blackfriday) - * [github.com/serenize/snaker](https://godoc.org/github.com/serenize/snaker) * [github.com/sergi/go-diff/diffmatchpatch](https://godoc.org/github.com/sergi/go-diff/diffmatchpatch)