diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-18 09:07:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-18 09:07:58 +0000 |
| commit | c342fdcb83651ba047ec9fd30264b53a4a0f5626 (patch) | |
| tree | f16b38726eed01e402e987241e6e8b9134775021 /workhorse/internal/api/api.go | |
| parent | 7134f4d4948700af6a8d477b3fbd43f46471a96b (diff) | |
| download | gitlab-ce-c342fdcb83651ba047ec9fd30264b53a4a0f5626.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/api/api.go')
| -rw-r--r-- | workhorse/internal/api/api.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/workhorse/internal/api/api.go b/workhorse/internal/api/api.go index 896f59a322a..8954923ad75 100644 --- a/workhorse/internal/api/api.go +++ b/workhorse/internal/api/api.go @@ -17,7 +17,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab/workhorse/internal/config" - "gitlab.com/gitlab-org/gitlab/workhorse/internal/gitaly" "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" "gitlab.com/gitlab-org/gitlab/workhorse/internal/log" @@ -150,7 +149,7 @@ type Response struct { // Used to communicate channel session details Channel *ChannelSettings // GitalyServer specifies an address and authentication token for a gitaly server we should connect to. - GitalyServer gitaly.Server + GitalyServer GitalyServer // Repository object for making gRPC requests to Gitaly. Repository gitalypb.Repository // For git-http, does the requestor have the right to view all refs? @@ -163,6 +162,12 @@ type Response struct { MaximumSize int64 } +type GitalyServer struct { + Address string `json:"address"` + Token string `json:"token"` + Features map[string]string `json:"features"` +} + // singleJoiningSlash is taken from reverseproxy.go:singleJoiningSlash func singleJoiningSlash(a, b string) string { aslash := strings.HasSuffix(a, "/") |