summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/repository.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '41016-import-gitlab-shell-projects' into 'master'Douwe Maan2017-12-151-4/+25
|\
| * Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-141-4/+25
* | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-1/+8
|\ \ | |/ |/|
| * Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-1/+8
* | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-121-3/+8
|\ \
| * | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-121-3/+8
| |/
* | Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-111-8/+28
|\ \ | |/ |/|
| * Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prepAlejandro Rodríguez2017-12-061-3/+5
| * Add feature flag to use gitaly-ssh mirroring when cloning internal reposAlejandro Rodríguez2017-12-061-7/+25
* | Migrate Git::Repository#fsck to GitalyKim Carlbäcker2017-12-081-2/+16
* | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-071-22/+10
|/
* Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitalyAhmad Sherif2017-12-051-17/+36
* Merge branch 'ce-gitaly-worktree-refactor' into 'master'Sean McGivern2017-12-051-8/+140
|\
| * Backport Squash/Rebase refactor from EEce-gitaly-worktree-refactorAlejandro Rodríguez2017-12-041-8/+140
* | Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-041-34/+53
|\ \ | |/ |/|
| * Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-041-34/+53
* | Move SingleRepositoryWorker#fsck into Gitlab::Git::RepositoryKim "BKC" Carlbäcker2017-12-041-2/+10
|/
* Merge branch 'sh-fix-root-ref-repository' into 'master'Rémy Coutable2017-12-011-1/+5
|\
| * Gracefully handle case when repository's root ref does not existsh-fix-root-ref-repositoryStan Hu2017-11-301-1/+5
* | We could simply count the commitsLin Jen-Shin2017-11-301-1/+1
|/
* Ensure MRs always use branch refs for comparisonSean McGivern2017-11-281-1/+7
* Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-231-4/+6
|\
| * Clean up repository fetch and mirror methodsDouwe Maan2017-11-231-4/+6
* | Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-231-3/+13
|/
* Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-221-5/+15
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-0/+5
* Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-201-1/+7
|\
| * Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-171-1/+7
* | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-0/+4
|\ \
| * | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+4
| |/
* | Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+3
|/
* Merge branch 'zj-move-repo-exists-opt-out' into 'master'Sean McGivern2017-11-131-1/+1
|\
| * Repository Exists check is OPT_OUT for GitalyZeger-Jan van de Weg2017-11-091-1/+1
* | Prepare Repository#fetch_source_branch for migrationJacob Vosmaer (GitLab)2017-11-101-23/+11
|/
* Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+5
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-061-1/+1
|\
| * removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-1/+1
* | Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-031-8/+18
|/
* Merge branch 'gitaly-ff-merge' into 'master'Rémy Coutable2017-11-021-8/+24
|\
| * Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-mergeAlejandro Rodríguez2017-10-311-8/+24
* | Merge branch 'jej/lfs-change-detection' into 'master'Douwe Maan2017-11-011-0/+8
|\ \ | |/ |/|
| * Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-011-0/+8
* | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-271-0/+11
* | Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
* | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-241-0/+10
|/
* Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-161-0/+18
|\
| * Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-0/+14
| * Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-121-0/+4
* | Popen with a timeoutAndrew Newdigate2017-10-161-0/+7
* | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-1/+11
|/