Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

merges in v0.13.3 #1433

Merged
merged 2 commits into from Nov 2, 2018
Merged

merges in v0.13.3 #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad1081f
merges in v0.13.3
markbates Nov 2, 2018
73e064d
fixes template merge issue
markbates Nov 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 12 additions & 8 deletions SHOULDERS.md
View file
Open in desktop
Expand Up @@ -7,6 +7,8 @@ Thank you to the following **GIANTS**:

* [github.com/BurntSushi/toml](https://godoc.org/github.com/BurntSushi/toml)

* [github.com/blang/semver](https://godoc.org/github.com/blang/semver)

* [github.com/cockroachdb/cockroach-go/crdb](https://godoc.org/github.com/cockroachdb/cockroach-go/crdb)

* [github.com/dustin/go-humanize](https://godoc.org/github.com/dustin/go-humanize)
Expand Down Expand Up @@ -53,6 +55,14 @@ Thank you to the following **GIANTS**:

* [github.com/gobuffalo/github_flavored_markdown/internal/russross/blackfriday](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/russross/blackfriday)

* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_diff](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_diff)

* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_go](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_go)

* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/octicon](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/octicon)

* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/sanitized_anchor_name](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/sanitized_anchor_name)

* [github.com/gobuffalo/logger](https://godoc.org/github.com/gobuffalo/logger)

* [github.com/gobuffalo/makr](https://godoc.org/github.com/gobuffalo/makr)
Expand All @@ -61,6 +71,8 @@ Thank you to the following **GIANTS**:

* [github.com/gobuffalo/meta](https://godoc.org/github.com/gobuffalo/meta)

* [github.com/gobuffalo/packd](https://godoc.org/github.com/gobuffalo/packd)

* [github.com/gobuffalo/packr](https://godoc.org/github.com/gobuffalo/packr)

* [github.com/gobuffalo/plush](https://godoc.org/github.com/gobuffalo/plush)
Expand Down Expand Up @@ -173,14 +185,6 @@ Thank you to the following **GIANTS**:

* [github.com/sergi/go-diff/diffmatchpatch](https://godoc.org/github.com/sergi/go-diff/diffmatchpatch)

* [github.com/shurcooL/highlight_diff](https://godoc.org/github.com/shurcooL/highlight_diff)

* [github.com/shurcooL/highlight_go](https://godoc.org/github.com/shurcooL/highlight_go)

* [github.com/shurcooL/octicon](https://godoc.org/github.com/shurcooL/octicon)

* [github.com/shurcooL/sanitized_anchor_name](https://godoc.org/github.com/shurcooL/sanitized_anchor_name)

* [github.com/sirupsen/logrus](https://godoc.org/github.com/sirupsen/logrus)

* [github.com/sourcegraph/annotate](https://godoc.org/github.com/sourcegraph/annotate)
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ stack: go 1.11

install:
- cmd: >-
choco install mingw
choco install mingw --version 5.3.0

set PATH=%GOPATH%\bin;%GOBIN%\bin;c:\tools\mingw64\bin;%PATH%

Expand Down
6 changes: 3 additions & 3 deletions genny/build/a_build-packr.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions go.mod
View file
Open in desktop
Expand Up @@ -7,10 +7,10 @@ require (
github.com/fatih/color v1.7.0
github.com/gobuffalo/buffalo-docker v1.0.4
github.com/gobuffalo/buffalo-plugins v1.6.7
github.com/gobuffalo/buffalo-pop v1.1.7
github.com/gobuffalo/buffalo-pop v1.1.8
github.com/gobuffalo/envy v1.6.7
github.com/gobuffalo/events v1.1.5
github.com/gobuffalo/fizz v1.0.15 // indirect
github.com/gobuffalo/fizz v1.0.16 // indirect
github.com/gobuffalo/flect v0.0.0-20181024204909-8f6be1a8c6c2
github.com/gobuffalo/genny v0.0.0-20181030163439-ed103521b8ec
github.com/gobuffalo/github_flavored_markdown v1.0.7
Expand All @@ -25,10 +25,10 @@ require (
github.com/gobuffalo/mw-i18n v0.0.0-20181027200759-09e0c99be4d3
github.com/gobuffalo/mw-paramlogger v0.0.0-20181005191442-d6ee392ec72e
github.com/gobuffalo/mw-tokenauth v0.0.0-20181001105134-8545f626c189
github.com/gobuffalo/packd v0.0.0-20181029140631-cf76bd87a5a6
github.com/gobuffalo/packr v1.16.0
github.com/gobuffalo/plush v3.7.21+incompatible
github.com/gobuffalo/pop v4.8.7+incompatible
github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264
github.com/gobuffalo/packr v1.17.0
github.com/gobuffalo/plush v3.7.22+incompatible
github.com/gobuffalo/pop v4.8.8+incompatible
github.com/gobuffalo/tags v2.0.11+incompatible
github.com/gobuffalo/x v0.0.0-20181025192250-1ef645d63fe8
github.com/gorilla/context v1.1.1
Expand All @@ -44,13 +44,13 @@ require (
github.com/markbates/sigtx v1.0.0
github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba
github.com/pkg/errors v0.8.0
github.com/sirupsen/logrus v1.1.1
github.com/sirupsen/logrus v1.2.0
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.2.1
github.com/stretchr/testify v1.2.2
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
golang.org/x/tools v0.0.0-20181030151751-bb28844c46df
golang.org/x/tools v0.0.0-20181102050050-92b943e6bff7
gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4
)