diff options
| author | John Cai <jcai@gitlab.com> | 2023-09-05 17:24:11 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2023-09-05 17:24:11 +0300 |
| commit | bda5c66c7a4207b1bfae779f367eba0776873cd5 (patch) | |
| tree | 54b06bb6046101e47b8a52a27a0f74486df4b684 /internal/gitaly/service/conflicts/testhelper_test.go | |
| parent | ee70bdad04139d85952a3f147040435c3f5ea15b (diff) | |
| parent | 9a4dd44812c14895d3702b3a5ad38195927e9996 (diff) | |
Merge branch 'pks-git2go-drop-command' into 'master'
Drop gitaly-git2go command and its infrastructure
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6317
Merged-by: John Cai <jcai@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Diffstat (limited to 'internal/gitaly/service/conflicts/testhelper_test.go')
| -rw-r--r-- | internal/gitaly/service/conflicts/testhelper_test.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index 813826e52..1d1b2f6e8 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -51,7 +51,6 @@ func runConflictsServer(tb testing.TB, cfg config.Cfg, hookManager hook.Manager) deps.GetGitCmdFactory(), deps.GetCatfileCache(), deps.GetConnsPool(), - deps.GetGit2goExecutor(), deps.GetHousekeepingManager(), deps.GetBackupSink(), deps.GetBackupLocator(), |