summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-061-5/+5
|\ | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129
| * removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-5/+5
| | | | | | | | | | | | | | | | also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch!
* | Merge branch 'jej/fix-lfs-changes-laziness' into 'master'Douwe Maan2017-11-063-19/+66
|\ \ | | | | | | | | | | | | Implement lazy popen so LfsChanges doesn't have to wait for rev-list to complete See merge request gitlab-org/gitlab-ce!15180
| * | Gitlab::Git::RevList and LfsChanges use lazy popenjej/fix-lfs-changes-lazinessJames Edwards-Jones2017-11-062-19/+49
| | |
| * | Gitlab::Git::Popen can lazily hand output to a blockJames Edwards-Jones2017-11-061-0/+17
| | | | | | | | | | | | | | | | | | This allows input to start processing immediately without waiting for the process to complete. This also allows long or infinite inputs to be partially processed, which will termiate the process when reading stops with SIGPIPE.
* | | Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-031-16/+61
| | |
* | | Add `Gitlab::Git::Repository#fetch` commandAlejandro Rodríguez2017-11-031-0/+15
| |/ |/|
* | Merge branch 'gitaly-ff-merge' into 'master'Rémy Coutable2017-11-021-21/+39
|\ \ | |/ |/| | | | | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPC Closes gitaly#693 See merge request gitlab-org/gitlab-ce!15040
| * Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-mergeAlejandro Rodríguez2017-10-311-21/+39
| |
* | Fix encoding issue with Repository.ls_filesKim Carlbäcker2017-11-021-0/+5
| |
* | Merge branch 'jej/lfs-change-detection' into 'master'Douwe Maan2017-11-014-29/+179
|\ \ | |/ |/| | | | | Detect changes to LFS pointers for pruning and integrity check See merge request gitlab-org/gitlab-ce!14785
| * Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-014-29/+179
| | | | | | | | Gitlab::Git::Blob.batch_lfs_metadata can be used to check for LFS pointers. It uses a lazy enumorator and filters by blob size
* | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-272-0/+58
| |
* | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-251-13/+15
| |
* | Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-251-0/+54
|\ \ | | | | | | | | | | | | | | | | | | Move all rugged operation for ff_merge inside Gitlab::Git Closes gitaly#683 See merge request gitlab-org/gitlab-ce!15011
| * | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-241-0/+54
| |/ | | | | | | We also delete some unused code related to the aforementioned feature.
* | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-241-2/+20
|\ \ | | | | | | | | | | | | Support `Gitaly::User`'s gl_username field See merge request gitlab-org/gitlab-ce!15016
| * | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-231-2/+20
| |/ | | | | | | | | We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
* | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-2/+13
| | | | | | | | That way we can enable the circuitbreaker for just one host at a time.
* | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-232-1/+27
| | | | | | | | | | | | | | | | 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.
* | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-232-178/+94
|/ | | | | | | | | | 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.
* Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-172-30/+4
|\ | | | | | | | | Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
| * Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-172-30/+4
| |
* | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-172-18/+40
|\ \ | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-18/+40
| | | | | | | | | | | | Instead of from the configuration file
* | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-161-5/+37
|\ \ \ | |/ / |/| | | | | | | | Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841
| * | Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-161-5/+37
| | |
* | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-161-0/+224
|\ \ \ | | | | | | | | | | | | | | | | Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
| * | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-13/+13
| | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
| * | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-0/+224
| | | | | | | | | | | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
* | | | Popen with a timeoutAndrew Newdigate2017-10-161-0/+132
| |_|/ |/| |
* | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-0/+39
|/ /
* | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-121-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix the format of rugged alternate directory list Closes #39046 See merge request gitlab-org/gitlab-ce!14840
| * | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-2/+2
| |/ | | | | | | Fixes #39046
* | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+15
|\ \ | |/ |/| | | | | | | | | Add `Gitlab::Git::Repository#fetch` command Closes gitaly#586 See merge request gitlab-org/gitlab-ce!14772
| * Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-091-0/+15
| |
* | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-111-18/+39
|/ | | | Fixes gitaly#629
* Replaces `tag: true` into `:tag` in the specsJacopo2017-10-075-19/+19
| | | | | | Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
* Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-041-0/+17
|
* Merge branch 'gitaly-delete-branch' into 'master'Douwe Maan2017-10-041-0/+28
|\ | | | | | | | | Implement OperationService.UserDeleteBranch Gitaly RPC See merge request gitlab-org/gitlab-ce!14603
| * Add OperationService.UserDeleteBranch Gitaly RPCgitaly-delete-branchAlejandro Rodríguez2017-10-031-0/+28
| |
* | Restore User.from_gitalyJacob Vosmaer (GitLab)2017-10-031-0/+14
|/
* Merge branch 'revert-configurable-size-limits' into 'master'Douwe Maan2017-10-022-36/+5
|\ | | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" See merge request gitlab-org/gitlab-ce!14628
| * Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-022-36/+5
| | | | | | | | This reverts commit 1d3c33b57eeb39df76e78fd37c86532c02aa22ac.
* | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-021-27/+5
|\ \ | |/ |/| | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPC Closes gitaly#544 See merge request gitlab-org/gitlab-ce!14522
| * Add a factory for `Gitaly::GitCommit`sAlejandro Rodríguez2017-09-301-27/+5
| |
* | Add username as GL_USERNAME in hooks (http)David Turner2017-09-293-12/+16
|/ | | | | | | | 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.
* Make Repository#has_visible_content more efficientJacob Vosmaer (GitLab)2017-09-291-0/+34
|
* Handle error when fetching ref for MR with deleted source branch38319-nomethoderror-undefined-method-sha-for-nil-nilclassSean McGivern2017-09-281-0/+78
| | | | | | 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.
* Migrate Gitlab::Git::Repository#log to GitalyKim "BKC" Carlbäcker2017-09-251-1/+9
|
View Lorry Controller Status