summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-252-83/+97
* Merge branch 'qa/gb/ci-cd-qa-pipelines' into 'master'Rémy Coutable2018-01-2523-93/+428
|\
| * Fix offense in runners settings QA page object classqa/gb/ci-cd-qa-pipelinesGrzegorz Bizon2018-01-231-1/+3
| * Wait for runner until it registers itself in QA testsGrzegorz Bizon2018-01-231-0/+1
| * Fix static-analysis offenses in QA support classGrzegorz Bizon2018-01-231-0/+4
| * Add specific views / selectors for QA runners pageGrzegorz Bizon2018-01-232-4/+14
| * Merge branch 'master' into qa/gb/ci-cd-qa-pipelinesGrzegorz Bizon2018-01-23281-4449/+5509
| |\
| * | Add views / selectors for pipeline show page objectGrzegorz Bizon2018-01-231-0/+12
| * | Assert on pipeline jobs statuses in CI/CD QA testsGrzegorz Bizon2018-01-235-4/+75
| * | Remove blocking wait-time for runner to register in QAGrzegorz Bizon2018-01-231-2/+0
| * | Use runner tags when processing CI/CD QA pipelinesGrzegorz Bizon2018-01-232-2/+16
| * | Refactor QA instance test scenario and tagsGrzegorz Bizon2018-01-237-46/+41
| * | Fix CI/CD end-to-end tests by waiting for changesGrzegorz Bizon2018-01-223-5/+7
| * | Reduce nesting and simplify CI/CD end-to-end testsGrzegorz Bizon2018-01-224-24/+56
| * | Wait for Runner to register in QA and DRY page objectsGrzegorz Bizon2018-01-224-10/+19
| * | Add end-to-end test for registering GitLab RunnerGrzegorz Bizon2018-01-229-16/+166
| * | Add GitLab Runner service to GitLab QAGrzegorz Bizon2018-01-225-42/+77
* | | Merge branch '42053-link-to-clusters-in-auto-devops-instead-of-kubernetes-ser...Rémy Coutable2018-01-255-13/+17
|\ \ \
| * | | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-255-13/+17
|/ / /
* | | Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-...Rémy Coutable2018-01-253-2/+30
|\ \ \
| * | | Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-233-2/+30
* | | | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-2511-256/+267
|\ \ \ \
| * | | | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-2411-256/+267
* | | | | Merge branch 'sh-add-gitaly-health-check' into 'master'Robert Speicher2018-01-258-4/+220
|\ \ \ \ \
| * | | | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-248-4/+220
* | | | | | Update CHANGELOG.md for 10.4.1Robert Speicher2018-01-247-32/+15
|/ / / / /
* | | | | Merge branch '39917-revert-this-merge-request-text' into 'master'Fatih Acet2018-01-242-0/+8
|\ \ \ \ \
| * | | | | Updates `Revert this merge request` textJacopo2018-01-242-0/+8
* | | | | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-242-1/+13
|\ \ \ \ \ \
| * | | | | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-242-1/+13
| |/ / / / /
* | | | | | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-2413-31/+153
|\ \ \ \ \ \
| * | | | | | Use limit for search count queriessearch-100Jan Provaznik2018-01-2313-31/+153
* | | | | | | Merge branch '40744-idempotent-ids' into 'master'Robert Speicher2018-01-2429-62/+86
|\ \ \ \ \ \ \
| * | | | | | | Avoid array indices to fixtures in JS specsNick Thomas2018-01-243-8/+11
| * | | | | | | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQLNick Thomas2018-01-241-0/+15
| * | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-2429-63/+69
* | | | | | | | Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'Robert Speicher2018-01-244-22/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-244-22/+67
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-244-3/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transactionDouwe Maan2018-01-244-3/+27
* | | | | | | | Merge branch '42361-workaround' into 'master'alejandro-testRobert Speicher2018-01-241-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Workaround a recaptcha pop-up that cannot be testedRémy Coutable2018-01-241-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master'Robert Speicher2018-01-241-63/+63
|\ \ \ \ \ \ \
| * | | | | | | Remove one Spinach job and add one RSpec jobrc/move-one-spinach-job-to-rspecRémy Coutable2018-01-241-63/+63
| |/ / / / / /
* | | | | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'Robert Speicher2018-01-2410-10/+64
|\ \ \ \ \ \ \
| * | | | | | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-2410-10/+64
* | | | | | | | Merge branch 'patch-28' into 'master'Robert Speicher2018-01-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in `.gitlab-ci.yml` headingMathijs de Kruyf2018-01-241-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-242-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove callback as we already update accordingly on servicesOswaldo Ferreira2018-01-242-24/+0