diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-08-06 18:55:09 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-08-06 18:55:09 +0300 |
| commit | 7f1e11018f45e578c9ae2692963617b0c401193d (patch) | |
| tree | c4419e7ca76e8d69981ed6ba9b7d8195427ac875 | |
| parent | 45f91bf4b223cb01239137e1d696156ab5d53b39 (diff) | |
| parent | e4a0c63ae737249bfd526eb17979d058e5e3dc5f (diff) | |
Merge branch 'jv-remove-proto-mod' into 'master'
Stop publishing gitaly/proto as separate go module
Closes #1839
See merge request gitlab-org/gitaly!1396
| -rw-r--r-- | go.mod | 3 | ||||
| -rw-r--r-- | proto/go.mod | 3 |
2 files changed, 0 insertions, 6 deletions
@@ -15,7 +15,6 @@ require ( github.com/sirupsen/logrus v1.2.0 github.com/stretchr/testify v1.3.0 github.com/tinylib/msgp v1.1.0 // indirect - gitlab.com/gitlab-org/gitaly/proto v0.0.0-00010101000000-000000000000 gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 @@ -26,5 +25,3 @@ require ( gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.2.2 // indirect ) - -replace gitlab.com/gitlab-org/gitaly/proto => ./proto diff --git a/proto/go.mod b/proto/go.mod deleted file mode 100644 index b0417e4ba..000000000 --- a/proto/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module gitlab.com/gitlab-org/gitaly/proto - -go 1.12 |