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:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2023-04-03 09:09:52 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2023-04-03 11:23:35 +0300
commitc9a98b8ca1834d6a43de2be8be87eb3ec4264778 (patch)
treeb2246563e283460736c24ee0e7102db62f25115c /internal/gitaly/service/conflicts/testhelper_test.go
parentb9173264367e7de1f6e3d5482589c0022b091335 (diff)
gitaly: Remove Ruby server dependency
The Ruby server is never set up anymore and we don't ever use it either. Let's remove the dependency on it.
Diffstat (limited to 'internal/gitaly/service/conflicts/testhelper_test.go')
-rw-r--r--internal/gitaly/service/conflicts/testhelper_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go
index b780be96b..56177c213 100644
--- a/internal/gitaly/service/conflicts/testhelper_test.go
+++ b/internal/gitaly/service/conflicts/testhelper_test.go
@@ -45,7 +45,7 @@ func setupConflictsService(tb testing.TB, ctx context.Context, hookManager hook.
}
func runConflictsServer(tb testing.TB, cfg config.Cfg, hookManager hook.Manager) string {
- return testserver.RunGitalyServer(tb, cfg, nil, func(srv *grpc.Server, deps *service.Dependencies) {
+ return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) {
gitalypb.RegisterConflictsServiceServer(srv, NewServer(
deps.GetHookManager(),
deps.GetLocator(),