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

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
markbates committed Aug 14, 2018
2 parents 678708d + d1b8df2 commit a0aa4d1
Show file tree
Hide file tree
Showing 5 changed files with 344 additions and 42 deletions.
198 changes: 198 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
# Gopkg.toml example
#
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
# 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"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true


[[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.1"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-basicauth"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-contenttype"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-csrf"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-forcessl"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-i18n"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-paramlogger"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-poptx"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/mw-tokenauth"

[[constraint]]
name = "github.com/gobuffalo/packr"
version = "1.13.1"

[[constraint]]
name = "github.com/gobuffalo/plush"
version = "3.7.13"

[[constraint]]
name = "github.com/gobuffalo/pop"
version = "4.6.4"

[[constraint]]
branch = "master"
name = "github.com/gobuffalo/shoulders"

[[constraint]]
name = "github.com/gobuffalo/tags"
version = "2.0.8"

[[constraint]]
name = "github.com/gobuffalo/uuid"
version = "2.0.2"

[[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.2"

[[constraint]]
name = "github.com/markbates/going"
version = "1.0.1"

[[constraint]]
name = "github.com/markbates/grift"
version = "1.0.1"

[[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.6"

[[constraint]]
name = "github.com/monoculum/formam"
version = "3.0.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.2"

[[constraint]]
name = "github.com/spf13/viper"
version = "1.1.0"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.2.2"

[[constraint]]
branch = "master"
name = "golang.org/x/crypto"

[[constraint]]
branch = "master"
name = "golang.org/x/sync"

[[constraint]]
name = "gopkg.in/mail.v2"
version = "2.2.0"

[prune]
go-tests = true
unused-packages = true
56 changes: 48 additions & 8 deletions SHOULDERS.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
# Buffalo Stands on the Shoulders of Giants
# `github.com/gobuffalo/buffalo` Stands on the Shoulders of Giants

Buffalo does not try to reinvent the wheel! Instead, it uses the already great wheels developed by the Go community and puts them altogether 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 altogether 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**:


* [C](https://godoc.org/C)

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

* [github.com/ajg/form](https://godoc.org/github.com/ajg/form)

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

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

* [github.com/dgrijalva/jwt-go](https://godoc.org/github.com/dgrijalva/jwt-go)

* [github.com/dustin/go-humanize](https://godoc.org/github.com/dustin/go-humanize)

* [github.com/fatih/color](https://godoc.org/github.com/fatih/color)

* [github.com/fatih/color/vendor/github.com/mattn/go-colorable](https://godoc.org/github.com/fatih/color/vendor/github.com/mattn/go-colorable)

* [github.com/fatih/color/vendor/github.com/mattn/go-isatty](https://godoc.org/github.com/fatih/color/vendor/github.com/mattn/go-isatty)

* [github.com/fatih/structs](https://godoc.org/github.com/fatih/structs)

* [github.com/fsnotify/fsnotify](https://godoc.org/github.com/fsnotify/fsnotify)
Expand Down Expand Up @@ -63,6 +75,8 @@ Thank you to the following **GIANTS**:

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

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

* [github.com/gobuffalo/pop/soda/cmd](https://godoc.org/github.com/gobuffalo/pop/soda/cmd)

* [github.com/gobuffalo/pop/soda/cmd/generate](https://godoc.org/github.com/gobuffalo/pop/soda/cmd/generate)
Expand All @@ -87,6 +101,8 @@ Thank you to the following **GIANTS**:

* [github.com/gorilla/mux](https://godoc.org/github.com/gorilla/mux)

* [github.com/gorilla/pat](https://godoc.org/github.com/gorilla/pat)

* [github.com/gorilla/securecookie](https://godoc.org/github.com/gorilla/securecookie)

* [github.com/gorilla/sessions](https://godoc.org/github.com/gorilla/sessions)
Expand Down Expand Up @@ -117,12 +133,16 @@ Thank you to the following **GIANTS**:

* [github.com/joho/godotenv](https://godoc.org/github.com/joho/godotenv)

* [github.com/kr/pretty](https://godoc.org/github.com/kr/pretty)

* [github.com/lib/pq](https://godoc.org/github.com/lib/pq)

* [github.com/lib/pq/oid](https://godoc.org/github.com/lib/pq/oid)

* [github.com/magiconair/properties](https://godoc.org/github.com/magiconair/properties)

* [github.com/magiconair/properties/assert](https://godoc.org/github.com/magiconair/properties/assert)

* [github.com/markbates/deplist](https://godoc.org/github.com/markbates/deplist)

* [github.com/markbates/going/defaults](https://godoc.org/github.com/markbates/going/defaults)
Expand All @@ -135,6 +155,8 @@ Thank you to the following **GIANTS**:

* [github.com/markbates/grift/grift](https://godoc.org/github.com/markbates/grift/grift)

* [github.com/markbates/hmax](https://godoc.org/github.com/markbates/hmax)

* [github.com/markbates/inflect](https://godoc.org/github.com/markbates/inflect)

* [github.com/markbates/refresh/refresh](https://godoc.org/github.com/markbates/refresh/refresh)
Expand All @@ -143,9 +165,9 @@ Thank you to the following **GIANTS**:

* [github.com/markbates/sigtx](https://godoc.org/github.com/markbates/sigtx)

* [github.com/mattn/go-colorable](https://godoc.org/github.com/mattn/go-colorable)
* [github.com/markbates/willie](https://godoc.org/github.com/markbates/willie)

* [github.com/mattn/go-isatty](https://godoc.org/github.com/mattn/go-isatty)
* [github.com/mattn/go-sqlite3](https://godoc.org/github.com/mattn/go-sqlite3)

* [github.com/microcosm-cc/bluemonday](https://godoc.org/github.com/microcosm-cc/bluemonday)

Expand All @@ -163,18 +185,18 @@ Thank you to the following **GIANTS**:

* [github.com/nicksnyder/go-i18n/i18n/translation](https://godoc.org/github.com/nicksnyder/go-i18n/i18n/translation)

* [github.com/onsi/ginkgo](https://godoc.org/github.com/onsi/ginkgo)

* [github.com/onsi/gomega](https://godoc.org/github.com/onsi/gomega)

* [github.com/pelletier/go-toml](https://godoc.org/github.com/pelletier/go-toml)

* [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)

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

* [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)
Expand Down Expand Up @@ -203,6 +225,16 @@ Thank you to the following **GIANTS**:

* [github.com/spf13/viper](https://godoc.org/github.com/spf13/viper)

* [github.com/stretchr/testify/assert](https://godoc.org/github.com/stretchr/testify/assert)

* [github.com/stretchr/testify/require](https://godoc.org/github.com/stretchr/testify/require)

* [github.com/stretchr/testify/suite](https://godoc.org/github.com/stretchr/testify/suite)

* [github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew](https://godoc.org/github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew)

* [github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib](https://godoc.org/github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib)

* [golang.org/x/crypto/bcrypt](https://godoc.org/golang.org/x/crypto/bcrypt)

* [golang.org/x/crypto/blowfish](https://godoc.org/golang.org/x/crypto/blowfish)
Expand All @@ -219,10 +251,18 @@ Thank you to the following **GIANTS**:

* [golang.org/x/sys/unix](https://godoc.org/golang.org/x/sys/unix)

* [golang.org/x/text/internal/gen](https://godoc.org/golang.org/x/text/internal/gen)

* [golang.org/x/text/internal/testtext](https://godoc.org/golang.org/x/text/internal/testtext)

* [golang.org/x/text/transform](https://godoc.org/golang.org/x/text/transform)

* [golang.org/x/text/unicode/cldr](https://godoc.org/golang.org/x/text/unicode/cldr)

* [golang.org/x/text/unicode/norm](https://godoc.org/golang.org/x/text/unicode/norm)

* [gopkg.in/check.v1](https://godoc.org/gopkg.in/check.v1)

* [gopkg.in/russross/blackfriday.v1](https://godoc.org/gopkg.in/russross/blackfriday.v1)

* [gopkg.in/yaml.v2](https://godoc.org/gopkg.in/yaml.v2)
Loading

0 comments on commit a0aa4d1

Please sign in to comment.