Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Moves more mr widget components into vue filesfl-mr-widget-refactor | Filipa Lacerda | 2018-01-24 | 11 | -256/+267 | |
* | | | | | | | | | | | Merge branch 'sh-add-gitaly-health-check' into 'master' | Robert Speicher | 2018-01-25 | 8 | -4/+220 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-check | Stan Hu | 2018-01-24 | 8 | -4/+220 | |
* | | | | | | | | | | | | Update CHANGELOG.md for 10.4.1 | Robert Speicher | 2018-01-24 | 7 | -32/+15 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '39917-revert-this-merge-request-text' into 'master' | Fatih Acet | 2018-01-24 | 2 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Updates `Revert this merge request` text | Jacopo | 2018-01-24 | 2 | -0/+8 | |
* | | | | | | | | | | | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master' | Robert Speicher | 2018-01-24 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage | Ahmad Sherif | 2018-01-24 | 2 | -1/+13 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'search-100' into 'master' | Yorick Peterse | 2018-01-24 | 13 | -31/+153 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use limit for search count queriessearch-100 | Jan Provaznik | 2018-01-23 | 13 | -31/+153 | |
* | | | | | | | | | | | | Merge branch '40744-idempotent-ids' into 'master' | Robert Speicher | 2018-01-24 | 29 | -62/+86 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Avoid array indices to fixtures in JS specs | Nick Thomas | 2018-01-24 | 3 | -8/+11 | |
| * | | | | | | | | | | | | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL | Nick Thomas | 2018-01-24 | 1 | -0/+15 | |
| * | | | | | | | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' | Nick Thomas | 2018-01-24 | 29 | -63/+69 | |
* | | | | | | | | | | | | | Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master' | Robert Speicher | 2018-01-24 | 4 | -22/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitaly | Ahmad Sherif | 2018-01-24 | 4 | -22/+67 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master' | Robert Speicher | 2018-01-24 | 4 | -3/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transaction | Douwe Maan | 2018-01-24 | 4 | -3/+27 | |
* | | | | | | | | | | | | | Merge branch '42361-workaround' into 'master'alejandro-test | Robert Speicher | 2018-01-24 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Workaround a recaptcha pop-up that cannot be tested | Rémy Coutable | 2018-01-24 | 1 | -0/+3 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master' | Robert Speicher | 2018-01-24 | 1 | -63/+63 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove one Spinach job and add one RSpec jobrc/move-one-spinach-job-to-rspec | Rémy Coutable | 2018-01-24 | 1 | -63/+63 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master' | Robert Speicher | 2018-01-24 | 10 | -10/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitaly | Ahmad Sherif | 2018-01-24 | 10 | -10/+64 | |
* | | | | | | | | | | | | Merge branch 'patch-28' into 'master' | Robert Speicher | 2018-01-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix typo in `.gitlab-ci.yml` heading | Mathijs de Kruyf | 2018-01-24 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master' | Douwe Maan | 2018-01-24 | 2 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove callback as we already update accordingly on services | Oswaldo Ferreira | 2018-01-24 | 2 | -24/+0 | |
| * | | | | | | | | | | | Update changelogosw-updates-merge-status-on-api-actions | Oswaldo Ferreira | 2018-01-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | Return more consistent values for merge_status on MR API | Oswaldo Ferreira | 2018-01-23 | 4 | -1/+39 | |
* | | | | | | | | | | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master' | Rémy Coutable | 2018-01-24 | 6 | -0/+165 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-application | Toon Claes | 2018-01-24 | 2 | -3/+7 | |
| * | | | | | | | | | | | Add documentation about when the application API was added | Toon Claes | 2018-01-24 | 2 | -1/+6 | |
| * | | | | | | | | | | | Add application create API | Nicolas MERELLI | 2018-01-24 | 6 | -0/+156 | |
* | | | | | | | | | | | | Merge branch 'groups-webpack-bundle' into 'master' | Filipa Lacerda | 2018-01-24 | 13 | -19/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fixed paginationgroups-webpack-bundle | Phil Hughes | 2018-01-23 | 1 | -3/+1 | |
| * | | | | | | | | | | | fixed group page specific JS | Phil Hughes | 2018-01-23 | 1 | -2/+0 | |
| * | | | | | | | | | | | Added dispatcher imports for groups webpack bundle | Phil Hughes | 2018-01-23 | 11 | -16/+25 | |
* | | | | | | | | | | | | Merge branch 'sh-fix-cross-site-forgery-errors' into 'master' | Rémy Coutable | 2018-01-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errors | Stan Hu | 2018-01-23 | 1 | -0/+2 | |
* | | | | | | | | | | | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master' | Filipa Lacerda | 2018-01-24 | 5 | -21/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | added missing imports | Phil Hughes | 2018-01-24 | 1 | -0/+4 | |
| * | | | | | | | | | | | | correctly imports performance bar | Phil Hughes | 2018-01-24 | 2 | -4/+2 | |
| * | | | | | | | | | | | | Added imports for dispatcher routes | Phil Hughes | 2018-01-24 | 2 | -17/+7 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'winh-axios-mock-restore' into 'master' | Filipa Lacerda | 2018-01-24 | 10 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restore | Winnie Hellmann | 2018-01-23 | 10 | -15/+15 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'rc/improve-setup-test-env' into 'master' | Grzegorz Bizon | 2018-01-24 | 3 | -5/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the co...rc/improve-setup-test-env | Rémy Coutable | 2018-01-23 | 3 | -5/+15 | |
* | | | | | | | | | | | | | Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master' | Grzegorz Bizon | 2018-01-24 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-files | Ahmad Sherif | 2018-01-23 | 2 | -1/+12 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |