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
2019-05-02Revert "Merge branch 'sh-upgrade-rubocop' into 'master'"jc-tempJohn Cai
This reverts commit 1e888f40a6f1525e6eca3c88b4539c87c9e10d6b, reversing changes made to 31248fb723a2b7a150eae552d14d9a68d10305b2.
2019-05-01Version 1.38.0v1.38.0John Cai
2019-05-01Merge branch 'sh-upgrade-rubocop' into 'master'John Cai
Upgrade Rubocop to 0.68.1 See merge request gitlab-org/gitaly!1229
2019-05-01Merge branch 'jc-add-catfile-cache' into 'master'John Cai
Add cache for batch files Closes #1505 See merge request gitlab-org/gitaly!1203
2019-05-01add cache for batch filesJohn Cai
adding a global cache for catfile batch. Integrate this with a feature flag in FindCommits.
2019-05-01Upgrade Rubocop to 0.68.1Stan Hu
Correct and exempt some cop failures. This is needed to support Ruby 2.6.
2019-05-01Version 1.37.0v1.37.0John Cai
2019-04-30Merge branch 'jv-changelog-1.35.1' into 'master'John Cai
Update changelog for 1.35.0 and 1.35.1 See merge request gitlab-org/gitaly!1226
2019-04-30Update changelog for 1.35.0 and 1.35.1Jacob Vosmaer
2019-04-30Merge branch 'has-gitalternates' into 'master'Paul Okstad
Add DisconnectGitAlternates RPC See merge request gitlab-org/gitaly!1141
2019-04-30Add DisconnectGitAlternates RPCJacob Vosmaer
2019-04-29Version 1.36.0v1.36.0Jacob Vosmaer
2019-04-29Revert "Version 1.35.1"Jacob Vosmaer
This reverts commit fdf1ce8bf5f1d5917bd9ec3237ef06c6a8a3499c. We erroneously tagged v1.35.1 on the master branch during a security release. This messed up the changelog. By reverting, we are restoring the changelog to a correct state.
2019-04-29Merge remote-tracking branch 'dev/master'Jacob Vosmaer
2019-04-26Merge branch 'jc-close-logruswriter' into 'master'Paul Okstad
Close logrus writer when command finishes Closes #1644 See merge request gitlab-org/gitaly!1225
2019-04-26Close logrus writer when command finishesJohn Cai
2019-04-26Merge branch 'add-new-rebase' into 'master'Paul Okstad
Add new two-phase Rebase RPC See merge request gitlab-org/gitaly!1208
2019-04-26Add new two-step Rebase RPCLuke Duncalfe
Adds a new Rebase RPC which is two-step. It yields the rebase commit SHA to the client after the first request, and expects the client to make a second request with Apply: true for the session to be complete. https://gitlab.com/gitlab-org/gitlab-ee/issues/5966 See particuarly the comment in that issue here: https://gitlab.com/gitlab-org/gitlab-ee/issues/5966#note_150894306
2019-04-26Merge branch 'do-not-write-commit-graph-using-commit-graph' into 'master'Paul Okstad
git gc invocation: don't write commit-graph with core.commitGraph=true See merge request gitlab-org/gitaly!1224
2019-04-26git gc invocation: don't write commit-graph with core.commitGraph=trueÆvar Arnfjörð Bjarmason
This amends code just added in 52ec70ee ("GarbageCollect RPC writes commit graph and enables via config", 2019-04-24). This isn't needed, and will result in "gc" dying in obscure circumstances on git versions before v2.22.0 (not released yet) if the existing graph were to be corrupted. See git-vcs/git@43d3561805 ("commit-graph write: don't die if the existing graph is corrupt", 2019-03-25). This isn't needed, and "git gc" as of v2.22.0 pretty does the equivalent of core.commitGraph=false now when writing out the graph, because we don't want a screwy existing graph to ruin our day when we write the new one. Also, having written all this explanation I find that this change isn't technically needed because 52ec70ee misspelled the config key as "commitGrap" instead of "commitGrap*h*", but let's remove this line anyway.
2019-04-25Merge branch 'jc-ensure-pool-exists-before-linking' into 'master'John Cai
Ensure pool exists in LinkRepositoryToObjectPool rpc See merge request gitlab-org/gitaly!1222
2019-04-25Merge branch 'sh-use-3way-merge-for-squash' into 'master'John Cai
Use 3-way merge for squashing commits See merge request gitlab-org/gitaly!1214
2019-04-25Use 3-way merge for squashing commitsStan Hu
A high number of squashes fail because some lines in the target branch changed in another commit. However, this failure doesn't happen if you attempt to squash a branch and merge it in this way: 1. git checkout my-branch 2. git rebase -i HEAD~N (where N is some number of commits) 3. git checkout master 4. git merge my-branch The fourth step does a 3-way merge. To emulate this behavior, we add `--3way` to the parameters when we attempt to apply the patch onto the target branch. Part of https://gitlab.com/gitlab-org/gitlab-ee/issues/10661
2019-04-25Merge branch 'jc-add-stderr-to-err' into 'master'John Cai
Log stderr returned by the command Closes #1491 See merge request gitlab-org/gitaly!1167
2019-04-25Merge branch 'sec-process' into 'master'John Cai
Sec process See merge request gitlab-org/gitaly!1221
2019-04-25Use constant for escapedNewLineJohn Cai
2019-04-25Use bufio.NewReaderSizeJohn Cai
2019-04-25Apply suggestion to doc/PROCESS.mdOswaldo Ferreira
2019-04-25Merge branch 'upgrade-activesupport-5-1' into 'master'Paul Okstad
Upgrade ActiveSupport to 5.1.7 See merge request gitlab-org/gitaly!1211
2019-04-25Apply suggestion to doc/PROCESS.mdOswaldo Ferreira
2019-04-25Apply suggestion to doc/PROCESS.mdOswaldo Ferreira
2019-04-25Merge branch 'po_job_logical_clock' into 'master'Paul Okstad
Logical clock data model for replication jobs Closes #1508 and #1607 See merge request gitlab-org/gitaly!1202
2019-04-25Logical clock data model for replication jobsPaul Okstad
2019-04-24Merge branch 'po_commit_graph' into 'master'Paul Okstad
GarbageCollect RPC writes commit graph and enables via config Closes #1627 See merge request gitlab-org/gitaly!1218
2019-04-24GarbageCollect RPC writes commit graph and enables via configPaul Okstad
2019-04-24Merge branch 'sh-bump-grpc-version' into 'master'Paul Okstad
Upgrade Ruby gRPC 1.19.0 and protobuf to 3.7.1 See merge request gitlab-org/gitaly!1066
2019-04-23Ensure pool exists before linkingJohn Cai
2019-04-23Version 1.35.1v1.35.1Paul Okstad
2019-04-23Merge branch 'add-security-changelog' into 'master'Paul Okstad
Add changelog for security release See merge request gitlab/gitaly!25
2019-04-23Add changelog for security releaseOswaldo Ferreira
2019-04-23Apply suggestion to doc/PROCESS.mdOswaldo Ferreira
2019-04-23Merge branch 'sh-bump-nokogiri-1.10.3' into 'master'Paul Okstad
Bump Nokogiri to 1.10.3 See merge request gitlab-org/gitaly!1217
2019-04-23Merge branch 'jc-add-fetch-into-object-pool' into 'master'John Cai
Adding FetchIntoObjectPool RPC See merge request gitlab-org/gitaly!1172
2019-04-23adding FetchIntoObjectPool RPCJohn Cai
2019-04-23Merge branch 'security-leaking-repo-mirror-credentials' into 'master'Paul Okstad
[Security] Improve sanitization of Gitaly exceptions See merge request gitlab/gitaly!16
2019-04-23Update PROCESS.mdZeger-Jan van de Weg
2019-04-23Document security releases targettingZeger-Jan van de Weg
2019-04-23Upgrade Ruby gRPC 1.19.0 and protobuf to 3.7.1Stan Hu
This is needed to support Ruby 2.6.
2019-04-23Upgrade ActiveSupport to 5.1.7Heinrich Lee Yu
This makes it consistent with the version in GitLab Rails
2019-04-23Merge branch 'sh-bump-bundler-version' into 'master'Paul Okstad
Bump Ruby bundler version to 1.17.3 See merge request gitlab-org/gitaly!1215
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 01:35:04 +0300