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
2021-01-12operations: Move `hookErrorFromStdoutAndStderr()` to where it's usedPatrick Steinhardt
2021-01-12operations: Fix UserFFBranch if called on an ambiguous referencePatrick Steinhardt
2020-12-14operations: Fix Go UserMergeBranch failing with ambiguous referencesPatrick Steinhardt
2020-12-04operations: Remove GoUserMergeToRef feature flagPatrick Steinhardt
2020-12-03Merge branch 'go_user_revert' into 'master'Pavlo Strokov
2020-12-03Port UserRevert to goJames Fargher
2020-12-02operations: Fix wrong ordering of merge parents for UserMergeBranchPatrick Steinhardt
2020-12-01operations: Expose server type to allow testing itPatrick Steinhardt
2020-12-01operations: Move update with hook logic into own filePatrick Steinhardt
2020-11-24Merge branch 'pks-hooks-validation' into 'master'Christian Couder
2020-11-20updateReferenceWithHooks: fix hook std(err|out) handling to be like RubyÆvar Arnfjörð Bjarmason
2020-11-20gitlabshell: Remove `Env()` in favor of `EnvFromConfig()`Patrick Steinhardt
2020-11-20Unbound initialization and validation funcs from global ConfigPavlo Strokov
2020-11-09operations: Fix error message when UserMergeToRef conflictsPatrick Steinhardt
2020-11-06Merge branch 'pks-operations-hook-gl-protocol' into 'master'Paul Okstad
2020-11-06operations: Always set GL_PROTOCOL in hooksPatrick Steinhardt
2020-11-04Resolve dependency on global state in rubyserver.SetHeadersPavlo Strokov
2020-11-03Merge branch 'pks-git2go-merge-precondition-failed' into 'master'Paul Okstad
2020-10-28operations: Use repository abstraction to resolve refsPatrick Steinhardt
2020-10-22operations: Return correct error code when merge failsPatrick Steinhardt
2020-10-22operations: Fix feature flag for UserMergeToRefPatrick Steinhardt
2020-10-19Invoke the reference-transaction hookChristian Couder
2020-10-16operations: Fix PostReceive hook receiving no inputPatrick Steinhardt
2020-10-14Add option to include conflict markers to merge commitIgor Drozdov
2020-09-23Initial go implementation of UserFFBranchJames Fargher
2020-09-22operations: Implement UserMergeToRefPatrick Steinhardt
2020-09-21git2go: Pass merge arguments via JSONPatrick Steinhardt
2020-09-15operations: Port UserMergeBranch from Ruby to GoPatrick Steinhardt
2020-09-07gitaly: Move Gitaly-specific code into `internal/gitaly`Patrick Steinhardt
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 19:07:30 +0300