diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-14 15:08:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-14 15:08:33 +0300 |
| commit | a5c4a731c88de720e6c23be355e44d916c34985f (patch) | |
| tree | 35f7c35385e9af8a747fa1b7af7d5fed976dc2c9 /workhorse/internal/api | |
| parent | 3438be0998953aa87854371f42df3c1f47bc2544 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/api')
| -rw-r--r-- | workhorse/internal/api/api.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/workhorse/internal/api/api.go b/workhorse/internal/api/api.go index 3c309887484..aa6d7cf1bc7 100644 --- a/workhorse/internal/api/api.go +++ b/workhorse/internal/api/api.go @@ -65,11 +65,13 @@ func NewAPI(myURL *url.URL, version string, roundTripper http.RoundTripper) *API type GeoProxyEndpointResponse struct { GeoProxyURL string `json:"geo_proxy_url"` GeoProxyExtraData string `json:"geo_proxy_extra_data"` + GeoEnabled bool `json:"geo_enabled"` } type GeoProxyData struct { GeoProxyURL *url.URL GeoProxyExtraData string + GeoEnabled bool } type HandleFunc func(http.ResponseWriter, *http.Request, *Response) @@ -458,5 +460,6 @@ func (api *API) GetGeoProxyData() (*GeoProxyData, error) { return &GeoProxyData{ GeoProxyURL: geoProxyURL, GeoProxyExtraData: response.GeoProxyExtraData, + GeoEnabled: response.GeoEnabled, }, nil } |