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
AgeCommit message (Collapse)Author
2023-07-16Add mailmap support in git-cat-fileissue_4364_add_mailmap_optionSiddharth Asthana
Enable mailmap_options feature flag Signed-off-by: Siddharth Asthana <siddharthasthana31@gmail.com>
2023-07-14Merge branch 'jt-server-ciphers' into 'master'John Cai
Use secure ciphers for TLS See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6073 Merged-by: John Cai <jcai@gitlab.com> Approved-by: Will Chandler <wchandler@gitlab.com> Co-authored-by: Justin Tobler <jtobler@gitlab.com>
2023-07-14Update changelog for 15.11.12GitLab Release Tools Bot
[ci skip]
2023-07-14Merge branch 'qmnguyen0711/fix-cgroup-linters-fail-on-macos' into 'master'Justin Tobler
Fix cgroup's MacOS-specific linter failures See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6057 Merged-by: Justin Tobler <jtobler@gitlab.com> Approved-by: Justin Tobler <jtobler@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Reviewed-by: Justin Tobler <jtobler@gitlab.com> Co-authored-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
2023-07-14Merge branch '4420-utilize-git-cat-file-batch-command-mode' into 'master'Sami Hiltunen
catfile: Implement `--batch-command` mode behind a FF See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6040 Merged-by: Sami Hiltunen <shiltunen@gitlab.com> Approved-by: Sami Hiltunen <shiltunen@gitlab.com> Reviewed-by: Sami Hiltunen <shiltunen@gitlab.com> Reviewed-by: John Cai <jcai@gitlab.com> Reviewed-by: karthik nayak <knayak@gitlab.com> Co-authored-by: Karthik Nayak <knayak@gitlab.com>
2023-07-14Merge branch 'renovate-tools/golangci-lint/github.com-spf13-viper-1.x' into ↵karthik nayak
'master' tools/golangci-lint: Update module github.com/spf13/viper to v1.16.0 See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5889 Merged-by: karthik nayak <knayak@gitlab.com> Approved-by: Toon Claes <toon@gitlab.com> Approved-by: karthik nayak <knayak@gitlab.com> Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
2023-07-14Merge branch 'smh-run-hooks-receive-pack' into 'master'Quang-Minh Nguyen
Run hooks in ReceivePack tests See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6061 Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Reviewed-by: Will Chandler <wchandler@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Co-authored-by: Will Chandler <wchandler@gitlab.com> Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
2023-07-14Run hooks in ReceivePack testsSami Hiltunen
2023-07-14Merge branch 'renovate/google.golang.org-grpc-1.x' into 'master'karthik nayak
go: Update module google.golang.org/grpc to v1.56.2 See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6074 Merged-by: karthik nayak <knayak@gitlab.com> Approved-by: karthik nayak <knayak@gitlab.com> Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
2023-07-14Merge branch 'renovate/golang.org-x-exp-digest' into 'master'karthik nayak
go: Update golang.org/x/exp digest to 613f0c0 See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6066 Merged-by: karthik nayak <knayak@gitlab.com> Approved-by: karthik nayak <knayak@gitlab.com> Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
2023-07-14Merge branch 'qmnguyen0711/improve-spawn-token-observability' into 'master'Quang-Minh Nguyen
Add more metrics and logs to spawn token See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6039 Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com> Approved-by: Will Chandler <wchandler@gitlab.com> Reviewed-by: Patrick Steinhardt <psteinhardt@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
2023-07-14tools/golangci-lint: Update exclude github.com/spf13/viper to v1.16.0GitLab Renovate Bot
The viper updates from v1.12.0 onwards breaks backward compatibility. See https://github.com/spf13/viper/pull/1577. To keep the bot from updating, let's update the exclude version.
2023-07-14Merge branch 'ahorvath-readme-20230711' into 'master'Quang-Minh Nguyen
doc: Refresh Gitaly README.md See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6050 Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Evan Read <eread@gitlab.com> Reviewed-by: Andras Horvath <ahorvath@gitlab.com> Reviewed-by: karthik nayak <knayak@gitlab.com> Co-authored-by: Evan Read <eread@gitlab.com> Co-authored-by: Andras Horvath <ahorvath@gitlab.com>
2023-07-14Fix cgroup's MacOS-specific linter failuresQuang-Minh Nguyen
In https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5547, we added the support for CgroupV2. It also introduced some linting offenses on MacOS. They are mostly about unused functions or types. On Linux, everything is fine. But on MacOS, files with specific build tags are not included.
2023-07-14Apply 1 suggestion(s) to 1 file(s)Evan Read
2023-07-13Update VERSION filesv16.2.0-rc4GitLab Release Tools Bot
2023-07-13go: Update module google.golang.org/grpc to v1.56.2GitLab Renovate Bot
2023-07-13go: Update golang.org/x/exp digest to 613f0c0GitLab Renovate Bot
2023-07-13praefect: Use secure ciphers for TLSJustin Tobler
The `tls.Config` used to configure the Praefect server does not specify a cipher suite to be used. Consequently, the default cipher suite defined by the `tls` package is used which contains ciphers with known security issues. The Go language maintains a list of cipher suites without known security issues that can be accessed through `tls.CipherSuites()`. Explicitly configure the `tls.Config` for Praefect servers to use the list of secure cipher suites maintained by Go.
2023-07-13Merge branch 'jt-ci-rails-specs' into 'master'John Cai
ci: Fix job rules for `rails-specs` and `rails-specs-cleanup` See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6072 Merged-by: John Cai <jcai@gitlab.com> Approved-by: John Cai <jcai@gitlab.com> Co-authored-by: Justin Tobler <jtobler@gitlab.com>
2023-07-13gitaly/server: Use secure ciphers for TLSJustin Tobler
The `tls.Config` used to configure the Gitaly server does not specify a cipher suite to be used. Consequently, the default cipher suite defined by the `tls` package is used which contains ciphers with known security issues. The Go language maintains a list of cipher suites without known security issues that can be accessed through `tls.CipherSuites()`. Explicitly configure the `tls.Config` for Gitaly servers to use the list of secure cipher suites maintained by Go.
2023-07-13Merge branch 'pks-git2go-commit-cleanup' into 'master'Will Chandler
git2go: Remove "apply" and "commit" subcommands See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6049 Merged-by: Will Chandler <wchandler@gitlab.com> Approved-by: Will Chandler <wchandler@gitlab.com> Approved-by: John Cai <jcai@gitlab.com> Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
2023-07-13Merge branch 'smh-finish-stream' into 'master'Toon Claes
Consume stream to finish in tests See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6063 Merged-by: Toon Claes <toon@gitlab.com> Approved-by: Toon Claes <toon@gitlab.com> Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
2023-07-13Merge branch 'smh-deletion-unique-path' into 'master'Will Chandler
Remove repository even if there is a failed deletion Closes #5422 See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6043 Merged-by: Will Chandler <wchandler@gitlab.com> Approved-by: karthik nayak <knayak@gitlab.com> Approved-by: Will Chandler <wchandler@gitlab.com> Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
2023-07-13ci: Fix job rules for `rails-specs` and `rails-specs-cleanup`Justin Tobler
For the CI pipeline to run correctly the `rail-specs` job needs the `start-rails-specs` job to run and the `rails-specs-cleanup` job needs the `rails-specs` job to run. These jobs have mismatched rules though preventing them from executing in the same context, which can lead to pipeline errors. Make the CI rules for the three jobs all use `rules_run_on_merge` to ensure they run in the same context.
2023-07-13doc: Remove unnecessary example linkAndras Horvath
2023-07-13doc: Add high-level Cluster diagramAndras Horvath
2023-07-13doc: Add high-level Cluster diagramAndras Horvath
2023-07-13Update VERSION filesv16.2.0-rc3GitLab Release Tools Bot
2023-07-13Merge branch 'kn-408142-list-conflict-files' into 'master'Will Chandler
conflicts: Add new field `skip_content_parsing` See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6064 Merged-by: Will Chandler <wchandler@gitlab.com> Approved-by: Will Chandler <wchandler@gitlab.com> Co-authored-by: Karthik Nayak <knayak@gitlab.com>
2023-07-13Merge branch 'backup_server_side_adapter' into 'master'Toon Claes
Add server-side flag to gitaly-backup create See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6026 Merged-by: Toon Claes <toon@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Toon Claes <toon@gitlab.com> Co-authored-by: James Fargher <jfargher@gitlab.com>
2023-07-13Merge branch '4580-reimplement-resolveconflicts-without-git2go' into 'master'Toon Claes
conflicts: Implement `ResolveConflicts` with Git Closes #4580 See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5954 Merged-by: Toon Claes <toon@gitlab.com> Approved-by: John Cai <jcai@gitlab.com> Reviewed-by: Toon Claes <toon@gitlab.com> Reviewed-by: John Cai <jcai@gitlab.com> Reviewed-by: karthik nayak <knayak@gitlab.com> Co-authored-by: Karthik Nayak <knayak@gitlab.com>
2023-07-13conflicts: Implement `SkipContentParsing` in `ListConflictFiles`Karthik Nayak
In the previous commit, we introduced the new field `SkipContentParsing` in the proto definition of `ListConflictFilesRequest`. The field will be used to skip conflicted file's content parsing and streaming. Let's implement the usage of the field by simply skipping the content parsing and streaming section within the `ListConflictFiles` RPC. Also add a test to test for this new functionality.
2023-07-13conflicts: Add new field `skip_content_parsing`Karthik Nayak
The `ListConflictFiles` RPC merges the provided tree-ish objects and returns the conflicted files along with their contents. Sometimes, we don't really care about the content of the conflicted files (for e.g. merge compatibility checks in CI/CD pipelines). Parsing file contents and streaming them is a laborious process and slows down the RPC. We should allow the clients to decide if they really need the contents of the conflicted files. The new fields will help us implement the functionality where the RPC would simply check for conflicts and return the conflicted filenames without the contents. While we're updating the proto with the new field. We also add missing documentation for `ListConflictFilesRequest`.
2023-07-13Merge branch 'smh-dont-asser-paths' into 'master'Quang-Minh Nguyen
Don't assert relative paths in various tests See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6062 Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: John Cai <jcai@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
2023-07-13Merge branch 'backup_unused_type' into 'master'John Cai
Move createBundleFromRefListSender type See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6070 Merged-by: John Cai <jcai@gitlab.com> Approved-by: John Cai <jcai@gitlab.com> Co-authored-by: James Fargher <jfargher@gitlab.com>
2023-07-13backup: Move createBundleFromRefListSender typeJames Fargher
This type is used to send refs to the CreateBundleFromRefList RPC. Now that backup.Repository is extracted it should be moved closer to where it is used.
2023-07-12Merge branch 'eread/change-to-backtick-strings-and-add-more-examples' into ↵Quang-Minh Nguyen
'master' Switch to using backticks for multiline strings for many commands See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6059 Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Co-authored-by: Evan Read <eread@gitlab.com>
2023-07-12Switch to using backticks for multiline strings for many commandsEvan Read
2023-07-12Don't assert repository path in TestFailedUserUpdateBranchDueToHooksSami Hiltunen
TestFailedUserUpdateBranchDueToHooks is asserting the repository's as it checks that the hooks is executed in the repository. The paths are subject to change and should not be asserted. Do the same assertion by checking that PWD matches GIT_DIR.
2023-07-12Don't assert repository path in TestUserUpdateSubmoduleSami Hiltunen
TestUserUpdateSubmodule is asserting the repository's path in an error message. This should be avoided as the repository path may change. Fix the test to not assert the exact repository path.
2023-07-12Consume stream to finish in TestUserRebaseConfirmable_skipEmptyCommitsSami Hiltunen
TestUserMergeBranch_failingHooks is not consuming the stream to finish. This causes unexpected behavior as the RPC is still open when the test ends. Avoid this by consuming the stream to finish in the test.
2023-07-12Consume stream to finish in TestUserMergeBranch_failingHooksSami Hiltunen
TestUserMergeBranch_failingHooks is not closing the stream in test scenarios that don't lead to an error. This causes unexpected behavior as the RPC is still open when the test ends. Avoid this by consuming the stream to finish in the test.
2023-07-12Don't assert hook path in TestTagHookOutputSami Hiltunen
TestTagHookOutput is asserting the hooks path in an error message. The hook path is subject to change and should not be asserted for equality. Fix the test to not assert the exact path.
2023-07-12Don't assert hook path in TestBranchHookOutputSami Hiltunen
TestBranchHookOutput is asserting the hooks path in an error message. The hook path is subject to change and should not be asserted for equality. Fix the test to not assert the exact path.
2023-07-12Merge branch 'pks-git-validate-reference' into 'master'Sami Hiltunen
git: Implement new function to validate reference names See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6018 Merged-by: Sami Hiltunen <shiltunen@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Sami Hiltunen <shiltunen@gitlab.com> Reviewed-by: Patrick Steinhardt <psteinhardt@gitlab.com> Reviewed-by: Sami Hiltunen <shiltunen@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
2023-07-12doc: Replace architecture SVG with mermaidAndras Horvath
2023-07-12Merge branch 'andrashorvath-master-patch-49636' into 'master'karthik nayak
Update Gitaly's Team Member Onboarding.md See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5995 Merged-by: karthik nayak <knayak@gitlab.com> Approved-by: karthik nayak <knayak@gitlab.com> Approved-by: Furhan Shabir <fshabir@gitlab.com> Co-authored-by: Andras Horvath <ahorvath@gitlab.com>
2023-07-12Merge branch 'backup_goroutine_leak' into 'master'Quang-Minh Nguyen
Ensure backup.Sink get cleaned up properly See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6046 Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Reviewed-by: John Cai <jcai@gitlab.com> Co-authored-by: James Fargher <jfargher@gitlab.com>
2023-07-12Merge branch 'smh-dont-assert-repo-path' into 'master'Will Chandler
Don't assert repository paths in errors in tests See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6023 Merged-by: Will Chandler <wchandler@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Approved-by: Will Chandler <wchandler@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 01:05:20 +0300