Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-30 18:07:02 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-30 18:07:02 +0300
commit826cf5293fb78029f76c5e769696e3b37e681207 (patch)
tree703bc997b5fa36c42e2bd7486f000ad41b01d252 /workhorse/internal/api
parent7aa22e9a103b049dd2da70045a5822c51164f7db (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/api')
-rw-r--r--workhorse/internal/api/api.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/workhorse/internal/api/api.go b/workhorse/internal/api/api.go
index ba27a3e6ec9..011890be569 100644
--- a/workhorse/internal/api/api.go
+++ b/workhorse/internal/api/api.go
@@ -129,9 +129,6 @@ type Response struct {
// 'git push' and 'git pull'
GL_REPOSITORY string
- // RemoteIp holds the IP of the request issuing the action
- RemoteIp string
-
// GitConfigOptions holds the custom options that we want to pass to the git command
GitConfigOptions []string
// StoreLFSPath is provided by the GitLab Rails application to mark where the tmp file should be placed.
@@ -166,9 +163,9 @@ type Response struct {
}
type GitalyServer struct {
- Address string `json:"address"`
- Token string `json:"token"`
- Features map[string]string `json:"features"`
+ Address string `json:"address"`
+ Token string `json:"token"`
+ CallMetadata map[string]string `json:"call_metadata"`
}
// singleJoiningSlash is taken from reverseproxy.go:singleJoiningSlash