6a5e8f1046
Merge branch 'gitaly-ff-merge' into 'master'
...
Incorporate Gitaly's OperationService.UserFFBranch RPC
Closes gitaly#693
See merge request gitlab-org/gitlab-ce!15040
2017-11-02 16:11:53 +00:00
e65bbc0ca4
Merge branch 'jej/lfs-change-detection' into 'master'
...
Detect changes to LFS pointers for pruning and integrity check
See merge request gitlab-org/gitlab-ce!14785
2017-11-01 17:33:41 +00:00
fb3f9c6e50
Detect changes to LFS pointers for pruning and integrity check
...
Gitlab::Git::Blob.batch_lfs_metadata can be used to check for LFS pointers. It uses a lazy enumorator and filters by blob size
2017-11-01 16:41:05 +00:00
37cc50f843
Incorporate Gitaly's OperationService.UserFFBranch RPC
2017-10-31 16:28:09 -03:00
56e53556c5
Migrate Gitlab::Git::Wiki#file to Gitaly
...
Closes gitaly#689
2017-10-31 20:49:41 +02:00
964cbb67da
Migrate Gitlab::Git::Wiki#page to Gitaly
...
Closes gitaly#677
2017-10-31 18:28:54 +02:00
b3a0166203
Migrate Gitlab::Git::Wiki#delete_page to Gitaly
...
Closes gitaly#673
2017-10-31 13:47:34 +02:00
57d7ed05d9
Fetch the merged branches at once
2017-10-27 15:55:08 +00:00
15e3d33761
Merge branch 'zj-commit-cache' into 'master'
...
Cache commits on the repository model
See merge request gitlab-org/gitlab-ce!14863
2017-10-27 13:31:05 +00:00
43f0bca648
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
2017-10-27 13:59:25 +02:00
3411fef1df
Cache commits on the repository model
...
Now, when requesting a commit from the Repository model, the results are
not cached. This means we're fetching the same commit by oid multiple times
during the same request. To prevent us from doing this, we now cache
results. Caching is done only based on object id (aka SHA).
Given we cache on the Repository model, results are scoped to the
associated project, eventhough the change of two repositories having the
same oids for different commits is small.
2017-10-27 12:49:11 +02:00
b0c419f9cd
Merge branch 'an/local_branches_opt_out' into 'master'
...
Make local_branches OPT_OUT
See merge request gitlab-org/gitlab-ce!15045
2017-10-26 12:08:29 +00:00
98c57e9a9f
Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'
...
Add path attribute to WikiFile class
Closes #39420
See merge request gitlab-org/gitlab-ce!15019
2017-10-26 11:41:04 +00:00
76becfb5b4
Add path attribute to WikiFile class
...
Fixes #39420
2017-10-26 13:04:33 +02:00
efdf51d838
Make local_branches OPT_OUT
2017-10-26 09:52:52 +00:00
42a45392a9
Fix the incorrect value being used to set GL_USERNAME on hooks
2017-10-25 14:01:57 -03:00
53ab16f6ff
Merge branch 'gitaly-ff-merge-preparation' into 'master'
...
Move all rugged operation for ff_merge inside Gitlab::Git
Closes gitaly#683
See merge request gitlab-org/gitlab-ce!15011
2017-10-25 12:42:25 +00:00
a64601b929
Move all rugged operation for ff_merge inside Gitlab::Git
...
We also delete some unused code related to the aforementioned feature.
2017-10-24 14:31:52 -03:00
30a8d2def3
Merge branch 'gitaly-gl-username' into 'master'
...
Support `Gitaly::User`'s gl_username field
See merge request gitlab-org/gitlab-ce!15016
2017-10-24 13:59:44 +00:00
4969f486f2
Support `Gitaly::User`'s gl_username field
...
We also unify conversions from and to `Gitaly::User`s in the
`Gitlab::Git::User` class.
2017-10-23 17:31:48 -03:00
705c15d7af
Allow enabling the circuitbreaker using an env variable
...
That way we can enable the circuitbreaker for just one host at a time.
2017-10-23 13:53:49 +03:00
591ee4e361
Perform the stat check multiple times when checking a storage
...
Instead of only checking once within a timeout, check multiple times
within a timeout.
That means with a timeout of 30 seconds and 3 retries. Each try would
be allowed 20 seconds.
2017-10-23 13:53:49 +03:00
430e767139
Implement backoff for the circuitbreaker
...
The circuitbreaker now has 2 failure modes:
- Backing off: This will raise the `Gitlab::Git::Storage::Failing`
exception. Access to the shard is blocked temporarily.
- Circuit broken: This will raise the
`Gitlab::Git::Storage::CircuitBroken` exception. Access to the shard
will be blocked until the failures are reset.
2017-10-23 12:02:23 +03:00
ed194a6d4a
Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Wiki#write_page to Gitaly
Closes gitaly#638
See merge request gitlab-org/gitlab-ce!14870
2017-10-18 11:13:50 +00:00
89f5ede2a3
Merge branch 'bvl-do-not-use-redis-keys' into 'master'
...
Avoid using `Redis#keys`
See merge request gitlab-org/gitlab-ce!14889
2017-10-17 16:15:44 +00:00
c365dea887
Don't use `Redis#keys` in the circuitbreaker
2017-10-17 12:47:20 +02:00
4bbdab764d
Merge branch 'bvl-circuitbreaker-improvements' into 'master'
...
Make the circuitbreaker configurable at runtime
See merge request gitlab-org/gitlab-ce!14842
2017-10-17 10:43:05 +00:00
619021fd7a
Read circuitbreaker settings from `Gitlab::CurrentSettings`
...
Instead of from the configuration file
2017-10-17 11:50:32 +02:00
fa5eeaecfb
Migrate Gitlab::Git::Wiki#write_page to Gitaly
...
Closes gitaly#638
2017-10-16 15:53:48 +02:00
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
Rémy Coutable
Douwe Maan
James Edwards-Jones
Alejandro Rodríguez
Ahmad Sherif
Lin Jen-Shin (godfat)
Sean McGivern
Zeger-Jan van de Weg
Andrew Newdigate
Bob Van Landuyt
Jacob Vosmaer
Dmitriy Zaporozhets