diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2020-11-24 14:12:51 +0300 |
|---|---|---|
| committer | Christian Couder <chriscool@tuxfamily.org> | 2020-11-24 14:12:51 +0300 |
| commit | be21832d969c88c6ca1f8e3a2aa6ea74b91b954e (patch) | |
| tree | c74975e19253d8e27c8739c5909a9025ccba99f6 /internal/gitaly/service/operations/merge.go | |
| parent | 35fd0ae3c408d8246f3f58d9971e1f780e418506 (diff) | |
| parent | e001791853bf8fdf3e9e4ca54935381a026db1a7 (diff) | |
Merge branch 'pks-hooks-validation' into 'master'
hooks: Improved validation and testing
See merge request gitlab-org/gitaly!2824
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index e42fce7ec..0439f4ec9 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -117,7 +117,7 @@ func hookErrorFromStdoutAndStderr(sout string, serr string) string { } func (s *server) updateReferenceWithHooks(ctx context.Context, repo *gitalypb.Repository, user *gitalypb.User, reference, newrev, oldrev string) error { - gitlabshellEnv, err := gitlabshell.Env() + gitlabshellEnv, err := gitlabshell.EnvFromConfig(s.cfg) if err != nil { return err } |