diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-07-31 17:19:30 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-07-31 17:19:30 +0300 |
| commit | febc866e1946099084513a54d4fec5cf164463de (patch) | |
| tree | 17f3b5468fc5d4d4aa0a48e10faa74037ae59146 /internal/rubyserver | |
| parent | 18d4cda8bd587604e093b2771a7c2544d834b38c (diff) | |
Use embedded Go stubs for gitaly-proto
Diffstat (limited to 'internal/rubyserver')
| -rw-r--r-- | internal/rubyserver/proxy.go | 2 | ||||
| -rw-r--r-- | internal/rubyserver/rubyserver.go | 2 | ||||
| -rw-r--r-- | internal/rubyserver/rubyserver_test.go | 2 | ||||
| -rw-r--r-- | internal/rubyserver/testhelper_test.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/internal/rubyserver/proxy.go b/internal/rubyserver/proxy.go index 98fe4bc2f..7535ab681 100644 --- a/internal/rubyserver/proxy.go +++ b/internal/rubyserver/proxy.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index 475c6a087..4b031762a 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -15,7 +15,6 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/config" "gitlab.com/gitlab-org/gitaly/internal/git/hooks" @@ -24,6 +23,7 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/rubyserver/balancer" "gitlab.com/gitlab-org/gitaly/internal/supervisor" "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/streamio" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" diff --git a/internal/rubyserver/rubyserver_test.go b/internal/rubyserver/rubyserver_test.go index 68eddd548..be3cbd477 100644 --- a/internal/rubyserver/rubyserver_test.go +++ b/internal/rubyserver/rubyserver_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/rubyserver/testhelper_test.go b/internal/rubyserver/testhelper_test.go index 2f3b2886a..ccb817900 100644 --- a/internal/rubyserver/testhelper_test.go +++ b/internal/rubyserver/testhelper_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) var ( |