Merge remote-tracking branch 'upstream/master'

.circleci/config.yml

@@ -34,7 +34,7 @@ jobs:
                 gqlgen/golang go run ./integration/server/server.go \
             )
 
-            sleep 2
+            sleep 20
 
             docker run \
                 -e SERVER_URL=http://integration_server:1234/query \

.circleci/golang.Dockerfile

@@ -1,12 +1,10 @@
-FROM golang:1.10
+FROM golang:1.11
 
-RUN curl -L -o /bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && chmod +x /bin/dep
-RUN go get -u github.com/alecthomas/gometalinter github.com/vektah/gorunpkg
-RUN gometalinter --install
+RUN curl -sL --fail https://github.com/golangci/golangci-lint/releases/download/v1.13/golangci-lint-1.13-linux-amd64.tar.gz | tar zxv --strip-components=1 --dir=/go/bin
 
-WORKDIR /go/src/github.com/99designs/gqlgen
+WORKDIR /projects/gqlgen
 
-COPY Gopkg.* /go/src/github.com/99designs/gqlgen/
-RUN dep ensure -v --vendor-only
+COPY go.* /projects/gqlgen/
+RUN go mod download
 
-COPY . /go/src/github.com/99designs/gqlgen/
+COPY . /projects/gqlgen/

.circleci/test.sh

@@ -18,4 +18,4 @@ echo "### running testsuite"
 go test -race ./...
 
 echo "### linting"
-gometalinter --vendor ./...
+golangci-lint run

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,10 @@
-### Expected Behaviour
+### What happened?
 
-### Actual Behavior
+### What did you expect?
 
 ### Minimal graphql.schema and models to reproduce
+
+### versions
+ - `gqlgen version`? 
+ - `go version`?
+ - dep or go modules?

.gitignore

@@ -5,5 +5,8 @@
 /integration/schema-fetched.graphql
 /example/chat/package-lock.json
 /codegen/gen
+/gen
 
 .idea/
+*.test
+*.out

.golangci.yml

@@ -0,0 +1,3 @@
+linters-settings:
+  errcheck:
+    ignore: fmt:.*,[rR]ead|[wW]rite|[cC]lose,io:Copy

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contribution Guidelines
+
+Want to contribute to gqlgen? Here are some guidelines for how we accept help.
+
+## Getting in Touch
+
+Our [gitter](https://gitter.im/gqlgen/Lobby) channel is the best place to ask questions or get advice on using gqlgen.
+
+## Reporting Bugs and Issues
+
+ We use [GitHub Issues](https://github.com/99designs/gqlgen/issues) to track bugs, so please do a search before submitting to ensure your problem isn't already tracked.
+
+### New Issues
+
+Please provide the expected and observed behaviours in your issue. A minimal GraphQL schema or configuration file should be provided where appropriate.
+
+## Proposing a Change
+
+If you intend to implement a feature for gqlgen, or make a non-trivial change to the current implementation, we recommend [first filing an issue](https://github.com/99designs/gqlgen/issues/new) marked with the `proposal` tag, so that the engineering team can provide guidance and feedback on the direction of an implementation.  This also help ensure that other people aren't also working on the same thing.
+
+Bug fixes are welcome and should come with appropriate test coverage.
+
+New features should be made against the `next` branch.
+
+### License
+
+By contributing to gqlgen, you agree that your contributions will be licensed under its MIT license.