diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-05-11 16:40:20 +0300 |
|---|---|---|
| committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-05-11 16:43:04 +0300 |
| commit | 1a649d9e4ecf093ae9b23dec259b3c7b8f0c1e45 (patch) | |
| tree | 8100d55da50a14091792d3c6b8e94e8ddd865579 | |
| parent | 8955b31698a0f37800294938fcac1fdfe029642c (diff) | |
Fixup CI failure in 8955b3169
Fix a CI failure in master since 8955b3169 (Merge branch
'ps-replaceMustRunCommandWithGittestAlternative' into 'master',
2021-05-11). The MR itself at [1] passed, and so did its MR pipeline,
but not once we merged to master.
This is because the merge CI was based on e892790af (Merge branch
'ps-rm-old-test-server-setup' into 'master', 2021-05-11). So we missed
33f7ab5d4 (Merge branch 'ps-use-gittest.Exec' into 'master',
2021-05-11) and 30ae36f78 (Merge branch 'ps-rm-clone-repo' into
'master', 2021-05-11).
1. https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3434
| -rw-r--r-- | internal/gitaly/service/operations/apply_patch_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/apply_patch_test.go b/internal/gitaly/service/operations/apply_patch_test.go index 8d82d0972..42538dd65 100644 --- a/internal/gitaly/service/operations/apply_patch_test.go +++ b/internal/gitaly/service/operations/apply_patch_test.go @@ -12,6 +12,7 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/internal/git" + "gitlab.com/gitlab-org/gitaly/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/internal/git/localrepo" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" |