summaryrefslogtreecommitdiff
path: root/go/internal/handler/upload_archive.go
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-10-15 06:43:08 +0000
committerNick Thomas <nick@gitlab.com>2019-10-15 06:43:08 +0000
commitc88d80fe74a27f6668d1aaa6db0abc6d2cf693e1 (patch)
tree25cab8c7310d639b17bbf6b6aa2b2bebc98c7d55 /go/internal/handler/upload_archive.go
parent43e87e272cce800962ae7fddf4aae08992c1ead8 (diff)
parent3bb2d7c227bf802dbbd82726db0475aa39a50efc (diff)
downloadgitlab-shell-c88d80fe74a27f6668d1aaa6db0abc6d2cf693e1.tar.gz
Merge branch 'jc-upgrade-gitaly' into 'master'
Upgrade Gitaly to 1.68.0 See merge request gitlab-org/gitlab-shell!347
Diffstat (limited to 'go/internal/handler/upload_archive.go')
-rw-r--r--go/internal/handler/upload_archive.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/go/internal/handler/upload_archive.go b/go/internal/handler/upload_archive.go
index eb2fa90..5180002 100644
--- a/go/internal/handler/upload_archive.go
+++ b/go/internal/handler/upload_archive.go
@@ -4,8 +4,8 @@ import (
"context"
"os"
- pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/client"
+ pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc"
)