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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/hook/prereceive.go')
-rw-r--r--internal/gitaly/hook/prereceive.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/internal/gitaly/hook/prereceive.go b/internal/gitaly/hook/prereceive.go
index 41dc8aca7..b3d10748f 100644
--- a/internal/gitaly/hook/prereceive.go
+++ b/internal/gitaly/hook/prereceive.go
@@ -12,6 +12,7 @@ import (
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
"gitlab.com/gitlab-org/gitaly/internal/git"
+ "gitlab.com/gitlab-org/gitaly/internal/gitlab"
"gitlab.com/gitlab-org/gitaly/internal/helper"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
)
@@ -116,7 +117,7 @@ func (m *GitLabHookManager) preReceiveHook(ctx context.Context, payload git.Hook
return helper.ErrInternalf("protocol not set")
}
- params := AllowedParams{
+ params := gitlab.AllowedParams{
RepoPath: repoPath,
GitObjectDirectory: repo.GitObjectDirectory,
GitAlternateObjectDirectories: repo.GitAlternateObjectDirectories,
@@ -126,7 +127,7 @@ func (m *GitLabHookManager) preReceiveHook(ctx context.Context, payload git.Hook
Changes: string(changes),
}
- allowed, message, err := m.gitlabAPI.Allowed(ctx, params)
+ allowed, message, err := m.gitlabClient.Allowed(ctx, params)
if err != nil {
return NotAllowedError{Message: fmt.Sprintf("GitLab: %v", err)}
}
@@ -156,7 +157,7 @@ func (m *GitLabHookManager) preReceiveHook(ctx context.Context, payload git.Hook
}
// reference counter
- ok, err := m.gitlabAPI.PreReceive(ctx, repo.GetGlRepository())
+ ok, err := m.gitlabClient.PreReceive(ctx, repo.GetGlRepository())
if err != nil {
return helper.ErrInternalf("calling pre_receive endpoint: %v", err)
}