Rename gitaly proto import to gitalypb

This change the result of a grep + sed, to move away from pb, and use
gitalypb instead. The gitalypb points to a vendorred directory that has
the same name. This would fix the use of goimports.

See also: https://gitlab.com/gitlab-org/gitaly-proto/merge_requests/213

1 files changed, 3 insertions, 3 deletions

diff --git a/internal/service/operations/squash.go b/internal/service/operations/squash.go
index 83e1ff88e..8e007f693 100644
--- a/internal/service/operations/squash.go
+++ b/internal/service/operations/squash.go
@@ -3,14 +3,14 @@ package operations
 import (
 	"fmt"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-func (s *server) UserSquash(ctx context.Context, req *pb.UserSquashRequest) (*pb.UserSquashResponse, error) {
+func (s *server) UserSquash(ctx context.Context, req *gitalypb.UserSquashRequest) (*gitalypb.UserSquashResponse, error) {
 	if err := validateUserSquashRequest(req); err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "UserSquash: %v", err)
 	}
@@ -28,7 +28,7 @@ func (s *server) UserSquash(ctx context.Context, req *pb.UserSquashRequest) (*pb
 	return client.UserSquash(clientCtx, req)
 }
 
-func validateUserSquashRequest(req *pb.UserSquashRequest) error {
+func validateUserSquashRequest(req *gitalypb.UserSquashRequest) error {
 	if req.GetRepository() == nil {
 		return fmt.Errorf("empty Repository")
 	}