summaryrefslogtreecommitdiff
path: root/lib/gitlab/git
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-013-37/+43
|\
| * Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-312-5/+5
| * Fix Diff#too_large? and specsDouwe Maan2017-05-301-3/+5
| * Fix Diff#to_hash and #init_from_hashDouwe Maan2017-05-301-0/+3
| * Consistent diff and blob size limit namesDouwe Maan2017-05-293-41/+42
* | Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
* | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-301-16/+30
|/
* Merge branch 'diffcollection-no-restarts' into 'master'Douwe Maan2017-05-261-18/+21
|\
| * Use the iterator inside DiffCollection only onceJacob Vosmaer2017-05-241-18/+21
* | Clean up diff renderingDouwe Maan2017-05-231-0/+2
* | Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-0/+8
|/
* Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-183-13/+67
|\
| * Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-173-6/+66
| * Compare ids of commits if present for equality testAlejandro Rodríguez2017-05-161-7/+1
* | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-161-13/+13
|/
* Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-3/+3
|\
| * Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrateAlejandro Rodríguez2017-05-111-3/+3
* | Don't reuse gRPC channelsJacob Vosmaer2017-05-151-8/+6
* | Add support for deltas_only under GitalyAhmad Sherif2017-05-131-9/+11
* | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-11/+0
|/
* Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-102-2/+2
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
* Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-0/+4
|\
| * Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-0/+4
* | Remove some unused Gitlab::Git codeJacob Vosmaer2017-05-091-50/+0
|/
* Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' Douwe Maan2017-05-041-7/+10
|\
| * Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topoTimothy Andrew2017-05-041-7/+10
* | Merge branch '31671-merge-request-message-contains-carriage-returns' into 'ma...Douwe Maan2017-05-031-21/+0
|\ \
| * | removes the possibility of commit messages having carriage returnsTiago Botelho2017-05-031-21/+0
* | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-2/+10
| |/ |/|
* | Re-enable ref operations with gitaly after not-found fixfix-gitaly-not-foundAlejandro Rodríguez2017-05-021-33/+29
* | Merge branch 'gitaly-branch-tag-count' into 'master' Sean McGivern2017-05-021-6/+23
|\ \
| * | Use Gitaly for getting Branch/Tag countsKim "BKC" Carlbäcker2017-04-281-6/+23
* | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-281-1/+5
|/ /
* | Small code tweaksDouwe Maan2017-04-271-4/+0
* | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-6/+17
|/
* Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING e...fix/encoding-issueJames Lopez2017-04-201-1/+7
* Refactor changing files in web UIDouwe Maan2017-04-201-15/+34
* Normalize sizes in Gitlab::Git::BlobDouwe Maan2017-04-171-2/+2
* Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-121-32/+40
|\
| * Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-32/+40
* | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-101-24/+25
* | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-1/+9
* | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+38
|/
* Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-071-2/+2
* Send more Gitaly::Repository fieldsJacob Vosmaer2017-04-071-0/+8
* Hopefully this worksuse-gitaly-find-ref-nameKim "BKC" Carlbäcker2017-04-061-1/+1
* Use Gitaly for Environment#first_deployment_forKim "BKC" Carlbäcker2017-04-061-0/+15
* Incorporate Gitaly client for refs serviceAlejandro Rodríguez2017-04-041-6/+38
* Merge branch '22303-symbolic-in-tree' into 'master' Douwe Maan2017-04-031-1/+1
|\