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
path: root/internal/gitaly/service/conflicts/resolve_conflicts_test.go
AgeCommit message (Expand)Author
2024-01-17fix: Fix a collection of typos found by typos-cliXing Xin
2023-09-19conflict: Respect user timezone for new commitsXing Xin
2023-07-24conflicts: Make the package SHA256 compatibleKarthik Nayak
2023-07-24conflicts: Remove git2go implementation of `ResolveConflicts`Karthik Nayak
2023-07-07conflicts: Implement `ResolveConflicts` with GitKarthik Nayak
2023-07-07featureflag: Introduce flag `ResolveConflictsViaGit`Karthik Nayak
2023-06-28praefect/coordinator: Unify ErrRepositoryNotSet errors with GitalyPatrick Steinhardt
2023-06-26conflicts: Add test for when no conflict is presentKarthik Nayak
2023-06-16conflicts: Remove unused function `setupConflictsService`Karthik Nayak
2023-06-16conflicts: Modernize the tests in `resolve_conflicts_test`Karthik Nayak
2023-06-12config/locator: Use ErrRepositoryNotSet errorsPatrick Steinhardt
2023-05-10go: Bump module version from v15 to v16Patrick Steinhardt
2023-02-08Extract file and executable permissionsJames Fargher
2023-01-20conflicts: Fix nil pointer access when conflict has no ancestorStan Hu
2022-12-14git: Rename `SubCmd` structure to `Command`Patrick Steinhardt
2022-12-09conflicts: Standardize errors creationPavlo Strokov
2022-12-01testhelper: Convert `GitalyOrPraefectMessage` to use genericsPatrick Steinhardt
2022-11-08middleware: Construct status based on the errorPavlo Strokov
2022-11-08testhelper: More descriptive name for GitalyOrPraefectPavlo Strokov
2022-11-08service/conflicts: Improve validation of inputPavlo Strokov
2022-10-14global: Reorder `testing.TB` before `context.Context` argumentsPatrick Steinhardt
2022-08-11golangci-lint: Enforce consistent naming of `testing.TB` variablesPatrick Steinhardt
2022-07-21gittest: Don't set up default parent in WriteCommitPatrick Steinhardt
2022-07-19updateref: Improve errors to include breadcrumbsPatrick Steinhardt
2022-07-18test: Disable all test with tag sha256Toon Claes
2022-05-20Update go package name from v14 to v15John Cai
2022-05-04conflicts: Drop ability to create test commit service with worktreesPatrick Steinhardt
2022-02-28localrepo: Remove flag to switch to sidechannels for internal fetchesPatrick Steinhardt
2022-02-16git: Convert internal fetches to use sidechannelPatrick Steinhardt
2022-02-01Propagate test context to setup helpers in conflicts packageSami Hiltunen
2022-02-01Create repositories via API in conflicts service testsSami Hiltunen
2022-02-01Refactor TestSuccessfulResolveConflictsRequestHelper to use the common setupSami Hiltunen
2022-01-27Automatically clean up testhelper.ContextSami Hiltunen
2021-12-20hook: Let custom hook scripts resolve Git via PATHPatrick Steinhardt
2021-12-06testhelper: Rename `GrpcEqualErr()` to `RequireGrpcError()`Patrick Steinhardt
2021-12-06testhelper: Rename `RequireGrpcError()` to `RequireGrpcCode()`Patrick Steinhardt
2021-12-06testhelper: Absorb helpers from the testassert packagePatrick Steinhardt
2021-11-25hook: Fix custom hook errors not propagating correctlyPatrick Steinhardt
2021-11-20Improve custom hook error loggingStan Hu
2021-10-26testhelper: Move build helpers into the testcfg packagePatrick Steinhardt
2021-10-26testhelper: Move helper to get Gitaly server metadataPatrick Steinhardt
2021-09-20global: Replace deprecated usage of `ioutil.WriteFile()`Patrick Steinhardt
2021-09-20global: Replace deprecated usage of `ioutil.ReadAll()`Patrick Steinhardt
2021-09-06updateref: Fix quarantine directory being migrated too latePatrick Steinhardt
2021-08-31global: Reformat sources with gofumptPatrick Steinhardt
2021-08-30updateref: Generalize `PreReceiveError` according to its usagePatrick Steinhardt
2021-08-12testhelper: Rename `ConfigureGitalySSHBin()`Patrick Steinhardt
2021-08-12testhelper: Rename `ConfigureGitalyHooksBin()`Patrick Steinhardt
2021-08-09conflicts: Always use object quarantine for ResolveConflictsPatrick Steinhardt
2021-08-09conflicts: Always resolve conflicts with hooksPatrick Steinhardt
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:17:53 +0300