summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-231-20/+5
|\
| * Clean up repository fetch and mirror methodsDouwe Maan2017-11-231-20/+5
* | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-231-1/+10
|\ \ | |/ |/|
| * Make sure repository is restoredLin Jen-Shin2017-11-231-0/+4
| * Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-231-1/+6
* | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-231-6/+11
|/
* Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-201-0/+26
|\
| * Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-171-0/+26
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+1
|\ \
| * | Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+1
| |/
* | Fix Gitlab::Git::Repository#remote_tags using unexisting variableAlejandro Rodríguez2017-11-201-5/+18
|/
* Prepare Repository#fetch_source_branch for migrationJacob Vosmaer (GitLab)2017-11-102-27/+142
* Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+15
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-061-5/+5
|\
| * removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-5/+5
* | Merge branch 'jej/fix-lfs-changes-laziness' into 'master'Douwe Maan2017-11-063-19/+66
|\ \
| * | 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
* | | 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 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 checkJames Edwards-Jones2017-11-014-29/+179
* | 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::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-241-0/+54
| |/
* | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-241-2/+20
|\ \
| * | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-231-2/+20
| |/
* | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-2/+13
* | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-232-1/+27
* | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-232-178/+94
|/
* Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-172-30/+4
|\
| * 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
|\ \
| * | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-18/+40
* | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-161-5/+37
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \
| * | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-13/+13
| * | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-0/+224
* | | | 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 listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-2/+2
| |/
* | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+15
|\ \ | |/ |/|
| * 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
|/