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/operations/merge.go
AgeCommit message (Expand)Author
2022-02-16operations: Enable use of detailed errors for UserMergeBranchPatrick Steinhardt
2022-01-27operations: Enable use of structured errors in UserMergeBranchPatrick Steinhardt
2022-01-24services: Inject Git2go executorPatrick Steinhardt
2022-01-21operations: Return detailed error when reference update fails in mergePatrick Steinhardt
2021-11-12lint: Inline exceptions about missing documentationPatrick Steinhardt
2021-09-02hook: Fix allowed errors not propagating correctly anymorePatrick Steinhardt
2021-08-31operations: Force-disable changed error handling in UserMergeBranchPatrick Steinhardt
2021-08-30operations: Implement rich errors for UserMergeBranch access checksPatrick Steinhardt
2021-08-30updateref: Generalize `PreReceiveError` according to its usagePatrick Steinhardt
2021-08-30gitaly-git2go: Return structured conflict error on merge conflictPatrick Steinhardt
2021-08-24quarantine: Always enable use of quarantine directoriesPatrick Steinhardt
2021-08-06operations: Support object quarantine in UserMergeBranchPatrick Steinhardt
2021-08-06operations: Support object quarantine in UserFFBranchPatrick Steinhardt
2021-08-06operations: Validate early whether UserFFBranch got a repositoryPatrick Steinhardt
2021-07-29operations: Make UserMergeBranch return PreconditionFailed on conflictsPavlo Strokov
2021-07-28helper: Fix name of `ErrPreconditionFailed{,f}()`Patrick Steinhardt
2021-07-20git2go: Inject repository into subcommandsPatrick Steinhardt
2021-07-20git2go: Implement merge on top of the executorPatrick Steinhardt
2021-07-16operations: Allow passing quarantine dir to `updateReferenceWithHooks()`Patrick Steinhardt
2021-07-01fix: Set operations timezone by UserBaodong
2021-06-30Fix target ref logging in merge commit error messageStan Hu
2021-06-29Merge branch 'sh-log-failed-precondition' into 'master'Zeger-Jan van de Weg
2021-06-28Refactor update reference with hooks codeStan Hu
2021-06-25Log details about merge commit errorsStan Hu
2021-06-23operations: Drop code supporting UserMergeToRef's precursory ref updatePatrick Steinhardt
2021-06-09operations: Skip precursory update of target ref in UserMergeToRefPatrick Steinhardt
2021-06-09operations: Rename variable in UserMergeToRefPatrick Steinhardt
2021-05-27Create module v14 gitaly versionPavlo Strokov
2021-05-05services: Provide helper function to construct localreposPatrick Steinhardt
2021-03-11replace existing isAncestor implementations with local repo's oneSami Hiltunen
2021-03-11git: Drop `GlobalOption`s from `New()`Patrick Steinhardt
2021-03-10operations: Use proper types for `updateReferenceWithHooks()`Patrick Steinhardt
2021-03-10operations: Use proper types for `isAncestor()`Patrick Steinhardt
2021-02-23featureflag: Remove UserFFBranch feature gateZeger-Jan van de Weg
2021-02-12DI git.CommandFactory into localrepo.RepoPavlo Strokov
2021-02-09Usage of the git.CommandFactory in operations packagePavlo Strokov
2021-01-26git: Move LocalRepository implementation into its own packagePatrick Steinhardt
2021-01-26operations: Wire up AllowConflicts handling for GoPatrick Steinhardt
2021-01-25featureflags: Remove GoUserMergeBranch feature flagPatrick Steinhardt
2021-01-25operations: Allow UserMergeToRef to get an optional timestampPatrick Steinhardt
2021-01-25operations: Allow UserMergeBranch to get an optional timestampPatrick Steinhardt
2021-01-21Merge branch 'avar/lint-refactoring' into 'master'Toon Claes
2021-01-19git: Pass Gitaly config when creating new repositoriesPatrick Steinhardt
2021-01-19git: Convert UpdateRef to accept properly typed argumentsPatrick Steinhardt
2021-01-19git: Convert ResolveRevision to return an ObjectIDPatrick Steinhardt
2021-01-19Lint: remove unused //nolint commentsÆvar Arnfjörð Bjarmason
2021-01-14git: Rename ResolveRefish() and have it accept a RevisionPatrick Steinhardt
2021-01-14git: Convert UpdateRef() to accept a ReferenceNamePatrick Steinhardt
2021-01-14git: Rename SafeCmd() to NewCommand()Patrick Steinhardt
2021-01-14Merge branch 'pks-user-ff-branch-ambiguous-ref' into 'master'Christian Couder
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 04:09:42 +0300