980423f6da
Merge branch 'git-env-handle-arrays' into 'master'
...
Add Gitlab::Git::Env.to_env_hash
See merge request gitlab-org/gitlab-ce!14841
2017-10-16 12:37:02 +00:00
e73af42239
Add Gitlab::Git::Env.to_env_hash
2017-10-16 13:19:44 +02:00
b2553840e8
Merge branch 'conflict-resolution-refactor' into 'master'
...
Conflict resolution refactor
See merge request gitlab-org/gitlab-ce!14747
2017-10-16 10:36:06 +00:00
f530261773
Popen with a timeout
2017-10-16 09:11:31 +00:00
0aff29f96b
Merge Merge Requests via Gitaly
2017-10-13 14:07:31 +02:00
9fdde3693b
Move line code generation into Gitlab::Git
...
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
3fcab51ebb
Refactor conflict resolution to contain git ops within Gitlab::Git
...
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
2017-10-12 22:03:14 -03:00
9cc15172de
Clean hierarchy of calls between models and Gitalb::Git for blob search
2017-10-12 22:03:09 -03:00
f72598b659
Move Gitlab::Diff::LineCode to module Gitlab::Git
2017-10-12 21:45:16 -03:00
05f46b820e
Merge branch 'fix/rugged-alternate-paths' into 'master'
...
Fix the format of rugged alternate directory list
Closes #39046
See merge request gitlab-org/gitlab-ce!14840
2017-10-12 15:37:14 +00:00
400557f0ba
Merge branch 'gitaly-fetch-remote' into 'master'
...
Add `Gitlab::Git::Repository#fetch` command
Closes gitaly#586
See merge request gitlab-org/gitlab-ce!14772
2017-10-12 14:53:32 +00:00
a24abf39bf
Fix the format of rugged alternate directory list
...
Fixes #39046
2017-10-12 14:20:04 +02:00
4378f56c7b
Pass git object dir attributes as relative paths to Gitaly
...
Fixes gitaly#629
2017-10-11 15:46:55 +02:00
06e7eeb1c2
Use Gitaly's RepositoryService.HasLocalBranches RPC
2017-10-10 14:26:32 -03:00
1731934398
Add `Gitlab::Git::Repository#fetch` command
2017-10-09 18:25:24 -03:00
4656283c5c
Gitaly namespace service enabled for GitLab
2017-10-05 14:11:32 +02:00
e25abf5be6
Use simple path for tmp ref, avoiding extra dir
...
So that we don't have to worry about cleaning empty
directories later. This was brought up at:
https://gitlab.com/gitlab-org/gitlab-ce/issues/38689#note_42242988
2017-10-05 17:30:44 +08:00
4a0f720a50
Merge branch 'capture-rev-list-errors' into 'master'
...
Include RevList error messages in exceptions
See merge request gitlab-org/gitlab-ce!14658
2017-10-04 12:07:23 +00:00
27e18f182f
Merge branch 'gitaly-fetch-ref' into 'master'
...
Let fetch_ref pull from Gitaly instead of from disk
Closes gitaly#585
See merge request gitlab-org/gitlab-ce!14588
2017-10-04 12:07:17 +00:00
147e2b21be
Let fetch_ref pull from Gitaly instead of from disk
2017-10-04 12:57:41 +02:00
45c5311a8b
Add missing exception variable
2017-10-04 12:29:06 +02:00
c6e5a77e51
Merge branch 'gitaly-delete-branch' into 'master'
...
Implement OperationService.UserDeleteBranch Gitaly RPC
See merge request gitlab-org/gitlab-ce!14603
2017-10-04 07:34:33 +00:00
79719cf003
Add OperationService.UserDeleteBranch Gitaly RPC
2017-10-03 21:06:34 -03:00
5dd26d4e5a
Hide Gollum inside Gitlab::Git::Wiki
2017-10-03 16:58:33 +00:00
bfd53aa6d0
Restore User.from_gitaly
2017-10-03 16:53:11 +00:00
f6966d8922
Include RevList error messages in exceptions
2017-10-03 16:33:32 +02:00
1440342fcf
Merge branch 'log-update-ref-errors' into 'master'
...
Log update-ref errors in OperationService
See merge request gitlab-org/gitlab-ce!14627
2017-10-02 15:32:59 +00:00
4716e81f9d
Merge branch 'revert-configurable-size-limits' into 'master'
...
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
See merge request gitlab-org/gitlab-ce!14628
2017-10-02 14:39:55 +00:00
a5d47bb063
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
...
This reverts commit 1d3c33b57e
2017-10-02 13:54:40 +01:00
581272f6d4
Log update-ref errors in OperationService
2017-10-02 14:39:09 +02:00
0a69abdb28
Merge branch 'gitaly-add-branch' into 'master'
...
Implement OperationService.UserAddBranch Gitaly RPC
Closes gitaly#544
See merge request gitlab-org/gitlab-ce!14522
2017-10-02 09:27:23 +00:00
fa5f0164eb
Implement OperationService.UserAddBranch Gitaly RPC
2017-09-30 00:58:56 -03:00
16f850033f
Populate `Gitlay::Repository`'s `gl_repository` field
2017-09-30 00:58:56 -03:00
01ce58bde4
add username to authorized result, so that gitlab-shell can pass it to hooks
2017-09-29 18:16:55 -04:00
dbcf48af8b
Add username as GL_USERNAME in hooks (http)
...
When calling pre-receive, post-receive, and update hooks, add the GitLab
username as the GL_USERNAME environment variable.
This patch only handles cases where pushes are over http, or via
the web interface. Later, we will address the ssh case.
2017-09-29 18:12:03 -04:00
999b7e553b
remove unused from_gitaly method
2017-09-29 18:12:02 -04:00
e5fecc3a37
Create repositories via Gitaly
2017-09-29 18:27:06 +02:00
403712f06e
Make Repository#has_visible_content more efficient
2017-09-29 13:08:44 +00:00
4f5be9ec7b
Migrate Gitlab::Git::Repository#add_tag to Gitaly
...
Closes gitaly#601
2017-09-29 00:53:49 +02:00
07c3112ef5
Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'
...
Migrate Git::Repository#rm_tag to Gitaly
Closes gitaly#562
See merge request gitlab-org/gitlab-ce!14388
2017-09-28 22:43:37 +00:00
3944e16b4b
Migrate Git::Repository#rm_tag to Gitaly
...
Closes gitaly#562
2017-09-28 23:36:40 +02:00
b63e8d64c1
Handle error when fetching ref for MR with deleted source branch
...
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
2017-09-28 11:11:10 +01:00
a02881dfda
RepositoryExists is always called with #gitaly_migration
2017-09-26 19:40:49 -03:00
9c16958c30
Migrate Gitlab::Git::Repository#log to Gitaly
2017-09-25 11:34:10 +02:00
7cf8e0981a
Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'
...
Allow the git circuit breaker to correctly handle missing repository storages
Closes #36549
See merge request gitlab-org/gitlab-ce!14417
2017-09-22 20:24:22 +00:00
604f176bf8
Merge branch 'feature/migrate-repository-diff' into 'master'
...
Migrate Gitlab::Git::Repository#diff to Gitaly
Closes gitaly#524
See merge request gitlab-org/gitlab-ce!14251
2017-09-22 11:43:11 +00:00
408c595292
Merge branch 'sh-blob-raw-check' into 'master'
...
Ensure that Blob.raw returns always returns a valid blob object
See merge request gitlab-org/gitlab-ce!14412
2017-09-22 10:40:27 +00:00
ba0ebbb510
Allow the git circuit breaker to correctly handle missing repository storages
2017-09-22 10:05:28 +01:00
794b4c5579
Ensure that Blob.raw returns always returns a valid blob object
...
In gitlab-org/gitlab-ee!2976 , we saw that a given OID could point
to a commit, which would cause the delta size check to fail.
Gitaly already returns nil if the OID isn't a blob, so this change
makes the Rugged implementation consistent.
2017-09-21 14:49:51 -04:00
Sean McGivern
Jacob Vosmaer
Andrew Newdigate
Alejandro Rodríguez
Douwe Maan
Dmitriy Zaporozhets
Ahmad Sherif
Zeger-Jan van de Weg
Lin Jen-Shin
Sean McGivern
David Turner
Robert Speicher
Kim "BKC" Carlbäcker
Nick Thomas
Stan Hu