diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-11-06 21:21:04 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-11-06 21:21:04 +0300 |
| commit | 3607cfccb573b16a63714539a982dbacc5179af7 (patch) | |
| tree | 30fd2a32b6f53714e9871aa2ca0a000fa7059e62 /internal/gitaly/service/operations/merge.go | |
| parent | 742d229748cd04facb7b9d5f7d64bb4fd57ee799 (diff) | |
| parent | a15efb05bcd8b8d8d7e7aa8f4b4936093bd952ea (diff) | |
Merge branch 'pks-operations-hook-gl-protocol' into 'master'
operations: Always set GL_PROTOCOL in hooks
Closes #3271
See merge request gitlab-org/gitaly!2753
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index bfde06571..31a0ed521 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -117,6 +117,7 @@ func (s *server) updateReferenceWithHooks(ctx context.Context, repo *gitalypb.Re } env := append([]string{ + "GL_PROTOCOL=web", fmt.Sprintf("GL_ID=%s", user.GetGlId()), fmt.Sprintf("GL_USERNAME=%s", user.GetGlUsername()), fmt.Sprintf("GL_REPOSITORY=%s", repo.GetGlRepository()), |