summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-244-26/+117
* 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
| * | | | Update changelogosw-updates-merge-status-on-api-actionsOswaldo Ferreira2018-01-231-1/+1
| * | | | Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-234-1/+39
* | | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-246-0/+165
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-applicationToon Claes2018-01-242-3/+7
| * | | | Add documentation about when the application API was addedToon Claes2018-01-242-1/+6
| * | | | Add application create APINicolas MERELLI2018-01-246-0/+156
* | | | | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-2413-19/+24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fixed paginationgroups-webpack-bundlePhil Hughes2018-01-231-3/+1
| * | | | fixed group page specific JSPhil Hughes2018-01-231-2/+0
| * | | | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-2311-16/+25
* | | | | Merge branch 'sh-fix-cross-site-forgery-errors' into 'master'Rémy Coutable2018-01-241-0/+2
|\ \ \ \ \
| * | | | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errorsStan Hu2018-01-231-0/+2
* | | | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master'Filipa Lacerda2018-01-245-21/+13
|\ \ \ \ \ \
| * | | | | | added missing importsPhil Hughes2018-01-241-0/+4
| * | | | | | correctly imports performance barPhil Hughes2018-01-242-4/+2
| * | | | | | Added imports for dispatcher routesPhil Hughes2018-01-242-17/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'winh-axios-mock-restore' into 'master'Filipa Lacerda2018-01-2410-15/+15
|\ \ \ \ \ \
| * | | | | | Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restoreWinnie Hellmann2018-01-2310-15/+15
* | | | | | | Merge branch 'rc/improve-setup-test-env' into 'master'Grzegorz Bizon2018-01-243-5/+15
|\ \ \ \ \ \ \
| * | | | | | | Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the co...rc/improve-setup-test-envRémy Coutable2018-01-233-5/+15
* | | | | | | | Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master'Grzegorz Bizon2018-01-242-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-232-1/+12
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'qa-deploy-key-factory-product' into 'master'Grzegorz Bizon2018-01-244-11/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Add .qa-project-deploy-keys to locate itqa-deploy-key-factory-productLin Jen-Shin2018-01-202-4/+4
| * | | | | | | | Scrap the deploy key title and match it in testLin Jen-Shin2018-01-203-10/+14
View Lorry Controller Status