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:
authorToon Claes <toon@gitlab.com>2022-09-09 12:20:33 +0300
committerToon Claes <toon@gitlab.com>2022-10-03 16:26:16 +0300
commita509dad104653e80d9b39b7e69b57d8e6d61e4fe (patch)
tree211e00e51fc0e6d081be3b3961c28b7bfa32e63a /internal/gitaly/service/conflicts/testhelper_test.go
parent19c093150080262b0ba794317083c476e3c14976 (diff)
linguist: Remove linguist instantiation dependency
Now linguist no longer loads colors when it's created, there's no more need to create an instance when Gitaly is started. So remove linguist as a dependency.
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 b399e2f69..d7add6e0b 100644
--- a/internal/gitaly/service/conflicts/testhelper_test.go
+++ b/internal/gitaly/service/conflicts/testhelper_test.go
@@ -73,9 +73,9 @@ func runConflictsServer(tb testing.TB, cfg config.Cfg, hookManager hook.Manager)
))
gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer(deps.GetHookManager(), deps.GetGitCmdFactory(), deps.GetPackObjectsCache(), deps.GetPackObjectsConcurrencyTracker()))
gitalypb.RegisterCommitServiceServer(srv, commit.NewServer(
+ deps.GetCfg(),
deps.GetLocator(),
deps.GetGitCmdFactory(),
- deps.GetLinguist(),
deps.GetCatfileCache(),
))
}, testserver.WithHookManager(hookManager))