diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-10-15 10:00:44 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-10-15 10:00:44 +0300 |
| commit | 78c182dd279cc6d497ca48d63cb7fd6c0e888e95 (patch) | |
| tree | eb419646c4b25093f1f3f066301d62e26fd10980 /internal/rubyserver | |
| parent | bff767c7c98f12ef011a40de2e0dfe318ca620f4 (diff) | |
| parent | 90e4c24f1ec8af0b2358185cbafaabddf205be27 (diff) | |
Merge branch 'fix-verify' into 'master'
Fix formatting
See merge request gitlab-org/gitaly!917
Diffstat (limited to 'internal/rubyserver')
| -rw-r--r-- | internal/rubyserver/proxy.go | 1 | ||||
| -rw-r--r-- | internal/rubyserver/proxy_test.go | 3 | ||||
| -rw-r--r-- | internal/rubyserver/rubyserver.go | 5 | ||||
| -rw-r--r-- | internal/rubyserver/rubyserver_test.go | 2 | ||||
| -rw-r--r-- | internal/rubyserver/worker.go | 5 |
5 files changed, 5 insertions, 11 deletions
diff --git a/internal/rubyserver/proxy.go b/internal/rubyserver/proxy.go index 0888506ef..98fe4bc2f 100644 --- a/internal/rubyserver/proxy.go +++ b/internal/rubyserver/proxy.go @@ -8,7 +8,6 @@ import ( "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/helper" - "google.golang.org/grpc/metadata" ) diff --git a/internal/rubyserver/proxy_test.go b/internal/rubyserver/proxy_test.go index 397cafe09..5b804c061 100644 --- a/internal/rubyserver/proxy_test.go +++ b/internal/rubyserver/proxy_test.go @@ -3,9 +3,8 @@ package rubyserver import ( "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/gitaly/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index fa4d9db9b..1e5112b16 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -11,6 +11,8 @@ import ( "sync" "time" + "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" @@ -20,9 +22,6 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/supervisor" "gitlab.com/gitlab-org/gitaly/internal/version" "gitlab.com/gitlab-org/gitaly/streamio" - - "github.com/grpc-ecosystem/go-grpc-prometheus" - log "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/internal/rubyserver/rubyserver_test.go b/internal/rubyserver/rubyserver_test.go index 2e598fe8b..68eddd548 100644 --- a/internal/rubyserver/rubyserver_test.go +++ b/internal/rubyserver/rubyserver_test.go @@ -5,10 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "google.golang.org/grpc/codes" ) diff --git a/internal/rubyserver/worker.go b/internal/rubyserver/worker.go index ca566d093..4dd44ae8f 100644 --- a/internal/rubyserver/worker.go +++ b/internal/rubyserver/worker.go @@ -5,12 +5,11 @@ import ( "syscall" "time" + "github.com/prometheus/client_golang/prometheus" + log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/config" "gitlab.com/gitlab-org/gitaly/internal/rubyserver/balancer" "gitlab.com/gitlab-org/gitaly/internal/supervisor" - - "github.com/prometheus/client_golang/prometheus" - log "github.com/sirupsen/logrus" ) var ( |