summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-3010-22/+319
|\
| * Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+33
| |\
| | * Added code for defining SHA attributesYorick Peterse2017-06-291-0/+33
| * | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-1/+2
| |\ \
| | * | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-1/+2
| * | | Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_u...Rémy Coutable2017-06-291-0/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updatedAlejandro Rodríguez2017-06-281-0/+9
| * | | Merge branch 'bvl-rename-all-reserved-paths' into 'master'Sean McGivern2017-06-294-17/+233
| |\ \ \ | | |/ / | |/| |
| | * | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysqlBob Van Landuyt2017-06-271-6/+6
| | * | Keep failed renames in redisBob Van Landuyt2017-06-261-0/+19
| | * | Use the migration name as a key in redisBob Van Landuyt2017-06-261-1/+1
| | * | Don't break rolling back when a namespace or project was renamedBob Van Landuyt2017-06-262-0/+14
| | * | Revert renames from a migrationBob Van Landuyt2017-06-261-0/+22
| | * | Revert namespace renamesBob Van Landuyt2017-06-263-16/+65
| | * | Add methods to revert project renamesBob Van Landuyt2017-06-262-16/+97
| | * | Track all renames in redisBob Van Landuyt2017-06-263-0/+31
| * | | Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-281-0/+24
| |\ \ \
| | * | | Fix gitaly ref encoding bugsJacob Vosmaer2017-06-281-0/+24
| * | | | Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-281-0/+4
| |\ \ \ \
| | * | | | Fix diff of requirements.txt file by not matching newlines as part of package...dm-dependency-linker-newlinesDouwe Maan2017-06-271-0/+4
| * | | | | Merge branch 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-281-0/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-281-0/+10
| * | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-281-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-271-4/+4
* | | | | | Fix doc, test, and formLin Jen-Shin2017-06-281-0/+1
|/ / / / /
* | | | | Merge branch 'backport-system-check-fix' into 'master'Douwe Maan2017-06-271-0/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fixGabriel Mazetto2017-06-271-2/+11
| * | | | Make the SimpleExecutor rescue exceptions in the executing ChecksGabriel Mazetto2017-06-271-2/+17
* | | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-272-49/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove 'contains' option from Commit.find_allJacob Vosmaer2017-06-271-20/+0
| * | | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-272-29/+27
* | | | | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-271-0/+1
|\ \ \ \ \
| * | | | | Add in_review_folder to usage pingzj-review-apps-usage-dataZ.J. van de Weg2017-06-271-0/+1
* | | | | | Merge branch '34324-gitlab-db-seed-is-broken' into 'master'Rémy Coutable2017-06-271-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-brokenSean McGivern2017-06-261-0/+4
| | |_|/ / | |/| | |
* | | | | Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'Sean McGivern2017-06-271-1/+3
|\ \ \ \ \
| * | | | | Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-databaseAdam Niedzielski2017-06-261-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'backport-renew-exclusive-lease' into 'master'Douwe Maan2017-06-261-0/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Introduce #renew for ExclusiveLeasebackport-renew-exclusive-leaseGabriel Mazetto2017-06-241-0/+13
| | |_|/ | |/| |
* | | | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-261-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-231-5/+5
| |/ /
* | | Merge branch 'dm-requirements-txt-tilde' into 'master'Grzegorz Bizon2017-06-231-0/+4
|\ \ \
| * | | Don't match tilde and exclamation mark as part of requirements.txt package namedm-requirements-txt-tildeDouwe Maan2017-06-231-0/+4
* | | | Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'Douwe Maan2017-06-231-3/+3
|\ \ \ \
| * | | | Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-231-3/+3
| | |/ / | |/| |
* | | | Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'Yorick Peterse2017-06-235-27/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Rubocop offense in migration helpers specsfix/gb/improve-updating-column-in-batches-helperGrzegorz Bizon2017-06-221-1/+1
| * | | Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helperGrzegorz Bizon2017-06-2283-1005/+1012
| |\ \ \ | | |/ /
| * | | Disable transaction in specs for some migrationsGrzegorz Bizon2017-06-221-1/+1
| * | | Fix specs for database migration helpers with transactionsGrzegorz Bizon2017-06-221-2/+8