removed the weird blackfriday dep (#1216)

Gopkg.toml

@@ -1,8 +1,166 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "3.2.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/dustin/go-humanize"
+
+[[constraint]]
+  name = "github.com/fatih/color"
+  version = "1.7.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gobuffalo/buffalo-plugins"
+
+[[constraint]]
+  name = "github.com/gobuffalo/envy"
+  version = "1.6.3"
+
+[[constraint]]
+  name = "github.com/gobuffalo/github_flavored_markdown"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/gobuffalo/makr"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/gobuffalo/packr"
+  version = "1.12.1"
+
+[[constraint]]
+  name = "github.com/gobuffalo/plush"
+  version = "3.7.11"
+
+[[override]]
+  name = "github.com/gobuffalo/pop"
+  branch = "master"
+
+[[override]]
+  name = "github.com/gobuffalo/fizz"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/gobuffalo/tags"
+  version = "2.0.7"
+
+[[constraint]]
+  name = "github.com/gobuffalo/uuid"
+  version = "2.0.1"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gobuffalo/x"
+
+[[constraint]]
+  name = "github.com/gorilla/context"
+  version = "1.1.1"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "1.6.2"
+
+[[constraint]]
+  name = "github.com/gorilla/sessions"
+  version = "1.1.1"
+
+[[constraint]]
+  name = "github.com/markbates/deplist"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/markbates/going"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/markbates/grift"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/markbates/inflect"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/markbates/refresh"
+  version = "1.4.1"
+
+[[constraint]]
+  name = "github.com/markbates/sigtx"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/markbates/willie"
+  version = "1.0.2"
+
+[[constraint]]
+  name = "github.com/monoculum/formam"
+  version = "3.0.0"
+
+[[constraint]]
+  name = "github.com/nicksnyder/go-i18n"
+  version = "1.10.0"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "1.0.6"
+
+[[constraint]]
+  name = "github.com/spf13/cobra"
+  version = "0.0.3"
+
+[[constraint]]
+  name = "github.com/spf13/pflag"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/spf13/viper"
+  version = "1.0.2"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.2"
+
 [[constraint]]
   branch = "master"
-  name = "github.com/russross/blackfriday"
+  name = "github.com/unrolled/secure"
 
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
 
-[prune]
-  go-tests = true
-  unused-packages = true
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/sync"
+
+[[constraint]]
+  name = "gopkg.in/mail.v2"
+  version = "2.2.0"

SHOULDERS.md

@@ -126,7 +126,7 @@ Thank you to the following **GIANTS**:
 
 * [github.com/sergi/go-diff/diffmatchpatch](https://godoc.org/github.com/sergi/go-diff/diffmatchpatch)
 
-* [github.com/shurcooL/github_flavored_markdown](https://godoc.org/github.com/shurcooL/github_flavored_markdown)
+* [github.com/gobuffalo/github_flavored_markdown](https://godoc.org/github.com/gobuffalo/github_flavored_markdown)
 
 * [github.com/shurcooL/highlight_diff](https://godoc.org/github.com/shurcooL/highlight_diff)
 

options_test.go

@@ -16,12 +16,12 @@ func TestOptions_NewOptions(t *testing.T) {
 		secret    string
 		expectErr string
 	}{
-		{name: "Development doesn't fail with no secret", env: "development", secret: "", expectErr: "securecookie: the value is not valid"},
-		{name: "Development doesn't fail with secret set", env: "development", secret: "secrets", expectErr: "securecookie: the value is not valid"},
-		{name: "Test doesn't fail with secret set", env: "test", secret: "", expectErr: "securecookie: the value is not valid"},
-		{name: "Test doesn't fail with secret set", env: "test", secret: "secrets", expectErr: "securecookie: the value is not valid"},
-		{name: "Production fails with no secret", env: "production", secret: "", expectErr: "securecookie: hash key is not set"},
-		{name: "Production doesn't fail with secret set", env: "production", secret: "secrets", expectErr: "securecookie: the value is not valid"},
+		{name: "Development doesn't fail with no secret", env: "development", secret: "", expectErr: "securecookie:"},
+		{name: "Development doesn't fail with secret set", env: "development", secret: "secrets", expectErr: "securecookie:"},
+		{name: "Test doesn't fail with secret set", env: "test", secret: "", expectErr: "securecookie:"},
+		{name: "Test doesn't fail with secret set", env: "test", secret: "secrets", expectErr: "securecookie:"},
+		{name: "Production fails with no secret", env: "production", secret: "", expectErr: "securecookie:"},
+		{name: "Production doesn't fail with secret set", env: "production", secret: "secrets", expectErr: "securecookie:"},
 	}
 
 	for _, test := range tests {
@@ -39,7 +39,7 @@ func TestOptions_NewOptions(t *testing.T) {
 				_, err := opts.SessionStore.New(req, "_buffalo_session")
 
 				r.Error(err)
-				r.Equal(test.expectErr, err.Error())
+				r.Contains(err.Error(), test.expectErr)
 			})
 		})
 	}

render/html.go

@@ -3,8 +3,8 @@ package render
 import (
 	"html"
 
+	"github.com/gobuffalo/github_flavored_markdown"
 	"github.com/gobuffalo/plush"
-	"github.com/shurcooL/github_flavored_markdown"
 )
 
 // HTML renders the named files using the 'text/html'

render/template.go

@@ -10,10 +10,6 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-
-	// this blank import is here because dep doesn't
-	// handle transitive dependencies correctly
-	_ "github.com/russross/blackfriday"
 )
 
 type templateRenderer struct {