diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-12-06 12:37:52 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-12-06 12:37:52 +0000 |
| commit | 0662bdd1b0b4b83cdd3aefa83de43073d5becc36 (patch) | |
| tree | a760fef0c9c99afd9752dbbc902308df67a0a011 /go/internal/handler | |
| parent | 46f0594457d805ae43b509c38cc5bb95ef76f4c9 (diff) | |
| parent | a7c243bb6d36684329fa8e9b96a95f2c22ba81e5 (diff) | |
| download | gitlab-shell-0662bdd1b0b4b83cdd3aefa83de43073d5becc36.tar.gz | |
Merge branch 'zj-rename-gitalypb' into 'master'
Upgrade gitaly Client dependency
See merge request gitlab-org/gitlab-shell!262
Diffstat (limited to 'go/internal/handler')
| -rw-r--r-- | go/internal/handler/receive_pack.go | 4 | ||||
| -rw-r--r-- | go/internal/handler/upload_archive.go | 4 | ||||
| -rw-r--r-- | go/internal/handler/upload_pack.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go index e69486f..096204f 100644 --- a/go/internal/handler/receive_pack.go +++ b/go/internal/handler/receive_pack.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" ) -func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32, error) { +func ReceivePack(gitalyAddress string, request *gitalypb.SSHReceivePackRequest) (int32, error) { if gitalyAddress == "" { return 0, fmt.Errorf("no gitaly_address given") } diff --git a/go/internal/handler/upload_archive.go b/go/internal/handler/upload_archive.go index 4ab1e71..8028c5b 100644 --- a/go/internal/handler/upload_archive.go +++ b/go/internal/handler/upload_archive.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" ) -func UploadArchive(gitalyAddress string, request *pb.SSHUploadArchiveRequest) (int32, error) { +func UploadArchive(gitalyAddress string, request *gitalypb.SSHUploadArchiveRequest) (int32, error) { if gitalyAddress == "" { return 0, fmt.Errorf("no gitaly_address given") } diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go index 51a2f3b..2aec2eb 100644 --- a/go/internal/handler/upload_pack.go +++ b/go/internal/handler/upload_pack.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" ) -func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, error) { +func UploadPack(gitalyAddress string, request *gitalypb.SSHUploadPackRequest) (int32, error) { if gitalyAddress == "" { return 0, fmt.Errorf("no gitaly_address given") } |