summaryrefslogtreecommitdiff
path: root/internal/gitlabnet
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-08-05 15:51:41 +0200
committerIgor Drozdov <idrozdov@gitlab.com>2022-08-05 17:44:56 +0200
commit2c18767176ff7bade7a2d745b0e95f1687c27b5d (patch)
treef7314573ecfacc671a978e44f234fb7097200314 /internal/gitlabnet
parentfe170537724ba95c7a7b776e1f02f8c19bfaa377 (diff)
downloadgitlab-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/gitlabnet')
-rw-r--r--internal/gitlabnet/accessverifier/client.go2
-rw-r--r--internal/gitlabnet/accessverifier/client_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitlabnet/accessverifier/client.go b/internal/gitlabnet/accessverifier/client.go
index c34802b..ca81ad1 100644
--- a/internal/gitlabnet/accessverifier/client.go
+++ b/internal/gitlabnet/accessverifier/client.go
@@ -5,7 +5,7 @@ import (
"fmt"
"net/http"
- 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/client"
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
diff --git a/internal/gitlabnet/accessverifier/client_test.go b/internal/gitlabnet/accessverifier/client_test.go
index 5a5d722..6a187f2 100644
--- a/internal/gitlabnet/accessverifier/client_test.go
+++ b/internal/gitlabnet/accessverifier/client_test.go
@@ -10,7 +10,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
- 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/client/testserver"
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"