summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-137-23/+111
* Add spec examples for Gitlab::Gitaly::WikiServiceAlejandro Rodríguez2017-11-131-0/+44
* Merge branch 'dm-avatarable-with-asset-host' into 'master'Rémy Coutable2017-11-098-131/+82
|\
| * Always return full avatar URL for private/internal groups/projects when asset...Douwe Maan2017-11-098-131/+82
|/
* Merge branch 'fix-todos-last-page' into 'master'Rémy Coutable2017-11-093-3/+8
|\
| * Fix access to the final page of todosSean McGivern2017-11-093-3/+8
* | Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes2017-11-092-26/+29
|\ \
| * | Enables scroll to bottom once user has scrolled back to bottom in job logFilipa Lacerda2017-11-092-26/+29
|/ /
* | Merge branch 'docs/support-release-tools-132' into 'master'Sean McGivern2017-11-091-15/+23
|\ \
| * | Use the new simpler `Pick into X.Y` labels workflow after the 7thRémy Coutable2017-11-091-15/+23
* | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'Rémy Coutable2017-11-094-1/+33
|\ \ \
| * | | Fix acceptance of username for Mattermost service update via APIMark Fletcher2017-11-084-1/+33
* | | | Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ...Sean McGivern2017-11-094-27/+29
|\ \ \ \
| * | | | Revert "add metrics tagging to the sidekiq middleware"39958-updatemergerequestsworker-are-failing-on-metric-taggingmicael.bergeron2017-11-084-27/+29
| |/ / /
* | | | Merge branch 'qa/gb/add-global-qa-scenario-arguments' into 'master'Rémy Coutable2017-11-0911-5/+128
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make it possible to define global scenario attributesGrzegorz Bizon2017-11-0911-5/+128
|/ / /
* | | Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-093-3/+36
|\ \ \
| * | | Support importing GH projects without rate limitsgithub-rake-task-rate-limitingYorick Peterse2017-11-082-0/+33
| * | | Restore GH enterprise support in the Rake taskYorick Peterse2017-11-081-3/+3
| |/ /
* | | Merge branch '36099-api-responses-missing-x-content-type-options-header' into...Douwe Maan2017-11-083-1/+15
* | | Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-082-1/+19
|/ /
* | Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-084-10/+27
|\ \
| * | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-074-10/+27
* | | Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-083-28/+137
|\ \ \
| * | | Fix the GH importer Rake taskgithub-enterprise-support-importerYorick Peterse2017-11-081-14/+18
| * | | Restore Enterprise support in the GH importerYorick Peterse2017-11-082-14/+119
| | |/ | |/|
* | | Merge branch 'fix/doc/39935-missing-fields-in-merge-request-payload' into 'ma...Achilleas Pipinellis2017-11-081-0/+6
|\ \ \
| * | | Fix issue 39935 : Add created_at and updated_atSébastien Le Gall2017-11-081-0/+6
* | | | Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-083-6/+46
|\ \ \ \
| * | | | Migrate GitLab::Git::Wiki.update_page to GitalyKim "BKC" Carlbäcker2017-11-083-6/+46
* | | | | Merge branch 'remove-ineffective-service-specs' into 'master'Filipa Lacerda2017-11-082-113/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove ineffective Vue service specsremove-ineffective-service-specsEric Eastwood2017-11-082-113/+0
* | | | | Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable2017-11-085-28/+69
|\ \ \ \ \
| * | | | | Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-085-28/+69
|/ / / / /
* | | | | Merge branch 'update-upload-documentation' into 'master'Nick Thomas2017-11-082-10/+59
|\ \ \ \ \
| * | | | | Added file storage documentation and updated hash storage oneGabriel Mazetto2017-11-082-10/+59
| |/ / / /
* | | | | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-0811-29/+16
|\ \ \ \ \
| * | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-0811-29/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bvl-update-externalization-docs' into 'master'Achilleas Pipinellis2017-11-081-15/+12
|\ \ \ \ \
| * | | | | Make a note of which files to check in after externalizing stringsbvl-update-externalization-docsBob Van Landuyt2017-11-081-15/+12
* | | | | | Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes2017-11-086-174/+204
|\ \ \ \ \ \
| * | | | | | Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-086-174/+204
|/ / / / / /
* | | | | | Merge branch 'rc-fixup-mattermost-test-runner' into 'master'Grzegorz Bizon2017-11-081-2/+2
|\ \ \ \ \ \
| * | | | | | Fix test selection in Test::Integration::MattermostRichard Clamp2017-11-081-2/+2
|/ / / / / /
* | | | | | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-08186-1294/+9142
|\ \ \ \ \ \
| * | | | | | Replace old GH importer with the parallel importergithub-importer-refactorYorick Peterse2017-11-0731-1042/+23
| * | | | | | Rewrite the GitHub importer from scratchYorick Peterse2017-11-07154-244/+9004
| * | | | | | Cache feature names in RequestStoreYorick Peterse2017-11-072-1/+54
| * | | | | | Add returning IDs to Gitlab::Database.bulk_insertYorick Peterse2017-11-072-2/+43
| * | | | | | Refactor User.find_by_any_emailYorick Peterse2017-11-072-9/+22