summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-052-5/+20
* Merge branch 'zj-blob-batch' into 'master'Douwe Maan2018-01-051-11/+4
|\
| * Reroute batch blobs to single blob RPCZeger-Jan van de Weg2018-01-021-11/+4
* | Merge branch 'ldap_username_attributes' into 'master'Douwe Maan2018-01-053-5/+98
|\ \
| * | Modify `LDAP::Person` to return username value based on attributesDrew Blessing2018-01-043-5/+98
* | | Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-041-0/+18
* | | Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m...Douwe Maan2018-01-041-0/+25
|\ \ \
| * | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-0/+25
* | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-042-58/+107
|\ \ \ \
| * | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-28/+69
| * | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-30/+38
* | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-041-9/+4
|\ \ \ \ \
| * | | | | Make DeleteConflictingRedirectRoutes no-opmk-no-op-delete-conflicting-redirectsMichael Kozono2018-01-031-9/+4
* | | | | | Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-041-2/+12
|\ \ \ \ \ \
| * | | | | | Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-2/+12
| |/ / / / /
* | | | | | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-041-0/+14
|\ \ \ \ \ \
| * | | | | | Better Englishgitaly-merge-nilJacob Vosmaer2018-01-031-1/+1
| * | | | | | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-031-0/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-041-3/+11
|\ \ \ \ \ \
| * | | | | | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-271-3/+11
* | | | | | | Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-041-1/+90
|\ \ \ \ \ \ \
| * | | | | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-031-1/+90
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-041-0/+124
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-021-0/+124
| |/ / / / /
* | | | | | fix issue #37843Danny2018-01-031-0/+4
* | | | | | Refactoring Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+6
* | | | | | Remove unused variable from bare repository importer specDouglas Barbosa Alexandre2018-01-031-1/+0
* | | | | | Refactoring spec for Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+11
* | | | | | Fix Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-031-2/+8
* | | | | | Import directory tree created with hashed storage using import rake taskDouglas Barbosa Alexandre2018-01-032-37/+96
| |_|_|/ / |/| | | |
* | | | | Merge branch 'sh-optimize-commit-stats' into 'master'Robert Speicher2018-01-031-0/+5
|\ \ \ \ \
| * | | | | Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-statsStan Hu2018-01-021-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-031-23/+49
|\ \ \ \ \
| * | | | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-021-23/+49
| | |_|/ / | |/| | |
* | | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' into...Douwe Maan2018-01-031-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | refactor code to use new import typeJames Lopez2018-01-031-1/+1
| * | | | fix wiki checkJames Lopez2018-01-021-0/+1
| * | | | add extra spec checkJames Lopez2018-01-021-1/+2
| * | | | Fix import scheduled on bare repo importJames Lopez2018-01-021-0/+8
| | |/ / | |/| |
* | | | Merge branch 'jprovazn-search-issues' into 'master'Sean McGivern2018-01-031-7/+28
|\ \ \ \
| * | | | Skip projects filter on issues searchjprovazn-search-issuesJan Provaznik2018-01-021-7/+28
* | | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-031-0/+90
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-1/+4
| * | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-271-7/+36
| * | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-0/+58
| | |_|/ | |/| |
* | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-021-0/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-291-0/+27
| |/ /
* | | Merge branch 'gitaly-encoding-helpers' into 'master'Grzegorz Bizon2017-12-292-14/+14
|\ \ \ | |/ / |/| |
| * | Move encoding methods to the more general EncodingHelpergitaly-encoding-helpersAlejandro Rodríguez2017-12-282-14/+14
* | | Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-movedStan Hu2017-12-251-2/+1