diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-06-04 08:05:15 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-06-04 08:05:15 +0000 |
| commit | fb67770a6f483c59d4540c776cb81737005a3cac (patch) | |
| tree | 10f79f776fd30501c7a8db8fa2eb06a3636756c8 /cmd | |
| parent | 40ff6687b3b0fbe5285cdeccf9afb84e42823a4b (diff) | |
| parent | 9f5a802258338483075aa440225d67e95616740f (diff) | |
| download | gitlab-shell-fb67770a6f483c59d4540c776cb81737005a3cac.tar.gz | |
Merge branch 'ps-upgrade-gitaly' into 'main'
fix: upgrade of the gitaly dependency
See merge request gitlab-org/gitlab-shell!481
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitlab-sshd/acceptance_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitlab-sshd/acceptance_test.go b/cmd/gitlab-sshd/acceptance_test.go index 3590bc7..760be8f 100644 --- a/cmd/gitlab-sshd/acceptance_test.go +++ b/cmd/gitlab-sshd/acceptance_test.go @@ -23,8 +23,8 @@ import ( "github.com/mikesmitty/edkey" "github.com/pires/go-proxyproto" "github.com/stretchr/testify/require" - gitalyClient "gitlab.com/gitlab-org/gitaly/client" - pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyClient "gitlab.com/gitlab-org/gitaly/v14/client" + pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" "golang.org/x/crypto/ssh" ) |