diff options
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 9b432a2ed..31a0ed521 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -55,7 +55,7 @@ func (s *server) UserMergeBranch(bidi gitalypb.OperationService_UserMergeBranchS return err } - clientCtx, err := rubyserver.SetHeaders(ctx, firstRequest.GetRepository()) + clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, firstRequest.GetRepository()) if err != nil { return err } @@ -359,7 +359,7 @@ func (s *server) userFFBranchRuby(ctx context.Context, in *gitalypb.UserFFBranch return nil, err } - clientCtx, err := rubyserver.SetHeaders(ctx, in.GetRepository()) + clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, in.GetRepository()) if err != nil { return nil, err } @@ -467,7 +467,7 @@ func (s *server) UserMergeToRef(ctx context.Context, in *gitalypb.UserMergeToRef return nil, helper.ErrInternal(err) } - clientCtx, err := rubyserver.SetHeaders(ctx, in.GetRepository()) + clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, in.GetRepository()) if err != nil { return nil, err } |