Commit Graph

564 Commits

Author SHA1 Message Date
GitLab Bot ec3483bd18 Add latest changes from gitlab-org/gitlab@master 2021-07-26 09:09:00 +00:00
GitLab Bot 1072f96e34 Add latest changes from gitlab-org/gitlab@master 2021-07-19 12:10:08 +00:00
GitLab Bot 01ef10900a Add latest changes from gitlab-org/gitlab@master 2021-07-15 06:09:39 +00:00
GitLab Bot 8a37720edf Add latest changes from gitlab-org/gitlab@master 2021-06-24 15:07:28 +00:00
GitLab Bot 9fcbd94aaa Add latest changes from gitlab-org/gitlab@master 2021-05-31 18:09:56 +00:00
GitLab Bot 03c84e0de5 Add latest changes from gitlab-org/gitlab@master 2021-05-27 06:10:47 +00:00
GitLab Bot 25db9c1230 Add latest changes from gitlab-org/gitlab@master 2021-05-06 12:10:38 +00:00
GitLab Bot be4b3134a2 Add latest changes from gitlab-org/gitlab@master 2021-05-04 15:10:36 +00:00
GitLab Bot 1769b59b9f Add latest changes from gitlab-org/gitlab@master 2021-04-01 18:13:56 +00:00
GitLab Bot cb840235d7 Add latest changes from gitlab-org/gitlab@master 2021-03-17 15:09:03 +00:00
GitLab Bot 8106ac487c Add latest changes from gitlab-org/gitlab@master 2021-01-14 15:10:46 +00:00
GitLab Bot a2f16969fa Add latest changes from gitlab-org/gitlab@master 2020-12-04 06:09:34 +00:00
GitLab Bot 9ae0f24e76 Add latest changes from gitlab-org/gitlab@master 2020-10-31 00:09:08 +00:00
GitLab Bot 3775eba7c1 Add latest changes from gitlab-org/gitlab@master 2020-10-16 12:09:33 +00:00
GitLab Bot c083f926c5 Add latest changes from gitlab-org/gitlab@master 2020-10-15 21:09:12 +00:00
GitLab Bot 4d922922a9 Add latest changes from gitlab-org/gitlab@master 2020-10-06 15:08:33 +00:00
GitLab Bot 7dc8bd3c16 Add latest changes from gitlab-org/gitlab@master 2020-09-15 21:09:35 +00:00
GitLab Bot 537882ad40 Add latest changes from gitlab-org/gitlab@master 2020-09-10 00:08:32 +00:00
GitLab Bot 71da5de44f Add latest changes from gitlab-org/gitlab@master 2020-08-05 15:09:59 +00:00
GitLab Bot 1b26aaa633 Add latest changes from gitlab-org/gitlab@master 2020-07-30 18:09:39 +00:00
GitLab Bot 3ce55b46df Add latest changes from gitlab-org/gitlab@master 2020-07-22 18:09:27 +00:00
GitLab Bot fe29f106cd Add latest changes from gitlab-org/gitlab@master 2020-07-17 09:09:43 +00:00
GitLab Bot 757d2fda7e Add latest changes from gitlab-org/gitlab@master 2020-06-26 21:08:51 +00:00
GitLab Bot 901af2a0dd Add latest changes from gitlab-org/gitlab@master 2020-06-23 18:09:28 +00:00
GitLab Bot 1127990db8 Add latest changes from gitlab-org/gitlab@master 2020-06-22 03:08:17 +00:00
GitLab Bot 95ad46159e Add latest changes from gitlab-org/gitlab@master 2020-03-30 21:08:01 +00:00
GitLab Bot 154b9bae14 Add latest changes from gitlab-org/gitlab@master 2020-03-17 21:09:16 +00:00
GitLab Bot 9345f69894 Add latest changes from gitlab-org/gitlab@master 2020-03-17 03:09:27 +00:00
GitLab Bot 3cd08f4bf9 Add latest changes from gitlab-org/gitlab@master 2020-03-13 00:09:34 +00:00
GitLab Bot 619d0b6922 Add latest changes from gitlab-org/gitlab@master 2020-02-26 18:09:24 +00:00
GitLab Bot cfaf1cca44 Add latest changes from gitlab-org/gitlab@master 2020-02-16 21:08:53 +00:00
GitLab Bot 0d6fa03312 Add latest changes from gitlab-org/gitlab@master 2020-02-06 18:08:54 +00:00
GitLab Bot fa478f1890 Add latest changes from gitlab-org/gitlab@master 2020-02-06 06:08:52 +00:00
GitLab Bot c8f773a859 Add latest changes from gitlab-org/gitlab@master 2020-01-30 21:08:47 +00:00
GitLab Bot 727b1a890c Add latest changes from gitlab-org/gitlab@master 2020-01-16 21:08:24 +00:00
GitLab Bot 29c01c6c91 Add latest changes from gitlab-org/gitlab@master 2019-11-14 03:06:25 +00:00
GitLab Bot 4f4dcd3c5d Add latest changes from gitlab-org/gitlab@master 2019-10-02 15:06:12 +00:00
dineshpanda e908e11776 Avoid calling freeze on already frozen strings in lib/gitlab 2019-09-04 09:52:02 +05:30
Stan Hu 291df05e43 Add Rugged calls to performance bar
This will help diagnose the source of excessive I/O from Rugged
calls. To implement this, we need to obtain the full list of arguments
sent to each request method.
2019-07-23 21:38:05 -07:00
Markus Koller f8cecafb07
Add start_sha to commits API
When passing start_branch on committing from the WebIDE, it's possible
that the branch has changed since editing started, which results in the
change being applied on top of the latest commit in the branch and
overwriting the new changes.

By passing the start_sha instead we can make sure that the change is
applied on top of the commit which the user started editing from.
2019-07-18 09:19:18 +02:00
Igor 0f46886880 Added submodule links to Submodule type in GraphQL API
This is part of migration of Folder View to Vue
2019-07-17 13:06:19 +00:00
Mayra Cabrera 0ab89d8e36 Add a rubocop for Rails.logger
Suggests to use a JSON structured log instead

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
2019-07-10 19:26:47 +00:00
Shinya Maeda 48307fac1e Extend MergeToRefService for creating merge ref from the other ref
Currently, MergeToRefService is specifically designed for
createing merge commits from source branch and target branch of
merge reqeusts. We extend this behavior to source branch and any
target ref paths.
2019-07-05 17:15:10 +07:00
GitalyBot e7b54b9cb8 Fix broken worktree test
The setup was wrong, and due to Gitaly being a bit more strict it had to
match up. The test is now accurate and passing again.
2019-06-25 14:45:51 +00:00
Luke Duncalfe dcf811ba14 CE backport for changes in EE MR 14017
This backports to CE changes to allow the EE model
DesignManagement::Repository to override the #attributes_at method to
provide its own git attributes.

The #attributes_at method was freely available, as it's never called by
anything in the app. It looks like the code that called it got
refactored out of existence in ca66a04f. It was still being called in a
spec
85b29c1c2f/spec/services/files/create_service_spec.rb (L40)
which I've left because with the change in Lfs::FileTransformer in fact
is now again the perfect test!

See EE MR
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14017

And these comment threads
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178002089
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178049984
2019-06-19 17:51:57 +00:00
Patrick Bajao 40fd0b9e40 Add client code to call GetObjectDirectorySize RPC
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
2019-06-05 20:58:46 +08:00
Zeger-Jan van de Weg 951afba624
Remove hook directory requirement from Shell
It used to be the case that GitLab created symlinks for each repository
to one copy of the Git hooks, so these ran when required. This changed
to set the hooks dynamically on Gitaly when invoking Git.

The side effect is that we didn't need all these symlinks anymore, which
Gitaly doesn't create anymore either. Now that means that the tests in
GitLab-Rails should test for it either.

Related: https://gitlab.com/gitlab-org/gitaly/issues/1392#note_175619926
2019-05-30 20:04:08 +02:00
John Cai f86797b5a9 Omit max-count for diverging_commit_counts behind feature flag
We want to optimize the query for the CountDivergingCommits rpc by
removing the --max-count argument now that we have commit graphs
enabled for all repositories during housekeeping. However, we want to
test this first behind a feature flag.
2019-05-14 12:13:19 -05:00
John Cai 0e033b3124 Add client methods for DisconnectGitAlternates rpc
DisconnectGitAlternates is a Gitaly RPC that will delete a repository's
objects/info/alternates file. This commit adds client support for that
RPC.
2019-05-03 15:59:28 -07:00
Luke Duncalfe 49cb4b3dfc Add support for two-step Gitaly Rebase RPC
The new two-step Gitaly `Rebase` RPC yields the rebase commit SHA to the
client before proceeding with the rebase.

This avoids an issue where the rebase commit SHA was returned when the
RPC had fully completed, and in some cases this would be after the Rails
`post_receive` worker services had already run. In these situations,
the merge request did not yet have its rebase_commit_sha attribute set
introducing the possibility for bugs (such as previous approvals being
reset).

https://gitlab.com/gitlab-org/gitlab-ee/issues/5966
2019-05-02 17:30:07 +00:00