summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 13931-custom-emoji-implementation13931-custom-emoji-implementationTiago Botelho2018-01-251765-21086/+44673
|\
| * 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
| | * | | | | | 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
| | | |_|/ / / / | | |/| | | | |
View Lorry Controller Status