summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-091-2/+6
* Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-092-11/+331
|\
| * Fix spec in shell_spec.rbJames Edwards-Jones2018-01-081-1/+1
| * Backport spec fixes in spec/lib/gitlab/shell_spec.rbValery Sizov2018-01-081-10/+12
| * Backport authorized_keys_enabled defaults to true'Michael Kozono2018-01-081-0/+212
| * Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-11/+99
| * Backport authorized_keys branch 'find-key-by-fingerprint'Pablo Carranza2018-01-081-0/+18
* | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-091-1/+2
|\ \
| * | Add speccheck-environment-regex-ceShinya Maeda2018-01-081-1/+2
* | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into 'm...Stan Hu2018-01-081-2/+18
|\ \ \
| * | | Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-051-2/+18
* | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-082-5/+20
|\ \ \ \
| * | | | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-052-5/+20
| | |_|/ | |/| |
* | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-082-3/+2
|\ \ \ \
| * | | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-042-3/+2
* | | | | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-082-16/+39
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro Rodríguez2018-01-052-16/+39
* | | | | Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'Kamil Trzciński2018-01-073-354/+454
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix/gb/fix-import-export-restoring-associationsGrzegorz Bizon2018-01-0612-101/+422
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Assert on correctly restoring pipelines after an importGrzegorz Bizon2018-01-051-0/+4
| * | | | | Fix import/export project tree saver specsGrzegorz Bizon2018-01-052-7/+19
| * | | | | Assign stage and pipeline to a status when importingGrzegorz Bizon2018-01-052-360/+410
| * | | | | Check if stage_id relation has been assigned onlyGrzegorz Bizon2018-01-041-1/+1
| * | | | | Add test for restoring associations with import/exportGrzegorz Bizon2018-01-042-2/+36
* | | | | | Fix error 500 when viewing commit and merge request diffsStan Hu2018-01-071-0/+14
* | | | | | Merge branch '22643-manual-job-page' into 'master'Kamil Trzciński2018-01-061-6/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-055-16/+120
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-0443-236/+883
| |\ \ \ \ \ \
| * | | | | | | Fix cycle analytics specsGrzegorz Bizon2018-01-041-6/+8
* | | | | | | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-057-29/+160
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-1/+39
| * | | | | | | Merge branch 'ce-backport=reorder-issues' into 'master'Sean McGivern2018-01-051-12/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Refactor matchers for background migrationsce-backport=reorder-issuesJarka Kadlecová2018-01-051-12/+1
| * | | | | | | 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
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Rename cache_index in safe_model_attributesMatija Čupić2018-01-051-1/+1
* | | | | | | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-0443-236/+883
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| |\ \ \ \ \ \ \ \
View Lorry Controller Status