merges v0.12.7 into development

.gitignore

@@ -7,6 +7,7 @@ pkg
 *.pid
 coverage
 coverage.data
+build/*
 *.pbxuser
 *.mode1v3
 .svn
@@ -25,9 +26,4 @@ generated/
 .vendor/
 bin/*
 gin-bin
-*.sqlite*
 .idea/
-.vscode
-vendor
-Gopkg.lock
-.grifter/

Dockerfile

@@ -13,8 +13,6 @@ ARG TRAVIS_PULL_REQUEST_SHA
 ARG TRAVIS_REPO_SLUG
 ARG TRAVIS_TAG
 
-RUN buffalo version
-
 ENV BP=$GOPATH/src/github.com/gobuffalo/buffalo
 
 RUN rm $(which buffalo)
@@ -24,9 +22,12 @@ WORKDIR $BP
 COPY . .
 
 RUN make ci-deps
-RUN make install
 
+RUN packr clean
 RUN gometalinter --vendor --deadline=5m ./... --skip=internal
+RUN make install
+
+RUN buffalo version
 
 RUN go test -tags "sqlite integration_test" -race  ./...
 RUN go test -tags "sqlite integration_test" -coverprofile cover.out -covermode count ./...

SHOULDERS.md

@@ -1,6 +1,6 @@
-# github.com/gobuffalo/buffalo Stands on the Shoulders of Giants
+# `github.com/gobuffalo/buffalo` Stands on the Shoulders of Giants
 
-github.com/gobuffalo/buffalo does not try to reinvent the wheel! Instead, it uses the already great wheels developed by the Go community and puts them all together in the best way possible. Without these giants this project would not be possible. Please make sure to check them out and thank them for all of their hard work.
+`github.com/gobuffalo/buffalo` does not try to reinvent the wheel! Instead, it uses the already great wheels developed by the Go community and puts them all together in the best way possible. Without these giants this project would not be possible. Please make sure to check them out and thank them for all of their hard work.
 
 Thank you to the following **GIANTS**:
 
@@ -37,6 +37,10 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/fizz/translators](https://godoc.org/github.com/gobuffalo/fizz/translators)
 
+* [github.com/gobuffalo/flect](https://godoc.org/github.com/gobuffalo/flect)
+
+* [github.com/gobuffalo/flect/name](https://godoc.org/github.com/gobuffalo/flect/name)
+
 * [github.com/gobuffalo/genny](https://godoc.org/github.com/gobuffalo/genny)
 
 * [github.com/gobuffalo/genny/movinglater/gotools/gomods](https://godoc.org/github.com/gobuffalo/genny/movinglater/gotools/gomods)
@@ -99,6 +103,18 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gorilla/sessions](https://godoc.org/github.com/gorilla/sessions)
 
+* [github.com/jackc/pgx](https://godoc.org/github.com/jackc/pgx)
+
+* [github.com/jackc/pgx/chunkreader](https://godoc.org/github.com/jackc/pgx/chunkreader)
+
+* [github.com/jackc/pgx/internal/sanitize](https://godoc.org/github.com/jackc/pgx/internal/sanitize)
+
+* [github.com/jackc/pgx/pgio](https://godoc.org/github.com/jackc/pgx/pgio)
+
+* [github.com/jackc/pgx/pgproto3](https://godoc.org/github.com/jackc/pgx/pgproto3)
+
+* [github.com/jackc/pgx/pgtype](https://godoc.org/github.com/jackc/pgx/pgtype)
+
 * [github.com/jmoiron/sqlx](https://godoc.org/github.com/jmoiron/sqlx)
 
 * [github.com/jmoiron/sqlx/reflectx](https://godoc.org/github.com/jmoiron/sqlx/reflectx)

appveyor.yml

@@ -30,4 +30,4 @@ build_script:
 
 test_script:
   - set GO111MODULE=on
-  - go test -tags "integration_test" -race ./...
+  - go test -tags "sqlite integration_test" -race ./...

buffalo/cmd/dev.go

@@ -93,7 +93,6 @@ func startWebpack(ctx context.Context) error {
 			return errors.Errorf("no node_modules directory found, and couldn't find %s to install it with", tool)
 		}
 		cmd := exec.CommandContext(ctx, tool, "install")
-		cmd.Stdin = os.Stdin
 		cmd.Stderr = os.Stderr
 		cmd.Stdout = os.Stdout
 		if err := cmd.Run(); err != nil {
@@ -102,7 +101,6 @@ func startWebpack(ctx context.Context) error {
 	}
 
 	cmd := exec.CommandContext(ctx, webpack.BinPath, "--watch")
-	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
 	return cmd.Run()

generators/assets/assets.go

@@ -1,4 +1 @@
 package assets
-
-// LogoURL is the URL to the SVG logo to be used for assets
-const LogoURL = "https://raw.githubusercontent.com/gobuffalo/buffalo/master/logo.svg"

generators/assets/standard/standard.go

@@ -1,20 +1,12 @@
 package standard
 
 import (
-	"path/filepath"
-
 	"github.com/gobuffalo/buffalo/generators"
-	"github.com/gobuffalo/buffalo/generators/assets"
 	"github.com/gobuffalo/makr"
 	"github.com/gobuffalo/packr"
 	"github.com/pkg/errors"
 )
 
-var logo = &makr.RemoteFile{
-	File:       makr.NewFile(filepath.Join("public", "assets", "images", "logo.svg"), ""),
-	RemotePath: assets.LogoURL,
-}
-
 // Run standard assets generator for those wishing to not use webpack
 func Run(root string, data makr.Data) error {
 	files, err := generators.FindByBox(packr.NewBox("../standard/templates"))
@@ -25,6 +17,5 @@ func Run(root string, data makr.Data) error {
 	for _, f := range files {
 		g.Add(makr.NewFile(f.WritePath, f.Body))
 	}
-	g.Add(logo)
 	return g.Run(root, data)
 }