diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2022-08-05 15:51:41 +0200 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2022-08-05 17:44:56 +0200 |
| commit | 2c18767176ff7bade7a2d745b0e95f1687c27b5d (patch) | |
| tree | f7314573ecfacc671a978e44f234fb7097200314 /internal/handler | |
| parent | fe170537724ba95c7a7b776e1f02f8c19bfaa377 (diff) | |
| download | gitlab-shell-2c18767176ff7bade7a2d745b0e95f1687c27b5d.tar.gz | |
Update Gitaly to v15
This commit also excludes gitlab-shell from dependencies:
Gitaly specifies Gitlab Shell as a dependency as well in order
to use gitlabnet client to perform API endpoints to Gitlab Rails.
As a result, Gitlab Shell requires Gitaly -> Gitaly requires an
older version of Gitlab Shell -> that version requires an older
version of Gitlab Shell, etc. Let's use exclude to break the
chain earlier
Diffstat (limited to 'internal/handler')
| -rw-r--r-- | internal/handler/exec.go | 2 | ||||
| -rw-r--r-- | internal/handler/exec_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/handler/exec.go b/internal/handler/exec.go index d756786..f2d2da8 100644 --- a/internal/handler/exec.go +++ b/internal/handler/exec.go @@ -16,7 +16,7 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/v14/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv" - pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" + pb "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" ) diff --git a/internal/handler/exec_test.go b/internal/handler/exec_test.go index 869871d..6404b7a 100644 --- a/internal/handler/exec_test.go +++ b/internal/handler/exec_test.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/metadata" grpcstatus "google.golang.org/grpc/status" - pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" + pb "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config" "gitlab.com/gitlab-org/gitlab-shell/v14/internal/gitlabnet/accessverifier" |