summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-105-7/+44
* Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'Stan Hu2017-11-092-5/+6
|\
| * Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable'Stan Hu2017-11-091-0/+2
| * Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-092-5/+4
|/
* Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master'Fatih Acet2017-11-092-1/+21
|\
| * Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmittingLuke "Jared" Bennett2017-11-062-1/+21
* | Merge branch 'br-add-glossary' into 'master'Sid Sijbrandij2017-11-091-16/+133
|\ \
| * | add glossary part 2br-add-glossaryBrittany Rohde2017-11-071-3/+3
| * | add glossary part 1Brittany Rohde2017-11-071-13/+130
* | | Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master'Tim Zallmann2017-11-092-16/+19
|\ \ \
| * | | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-jsEric Eastwood2017-11-092-16/+19
* | | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-091-4/+18
|\ \ \ \
| * | | | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clippingAnnabel Dunstone Gray2017-11-081-3/+14
| * | | | Remove max-width on desktopAnnabel Dunstone Gray2017-11-081-1/+4
* | | | | Merge branch 'winh-subgroups-api' into 'master'Rémy Coutable2017-11-094-26/+230
|\ \ \ \ \
| * | | | | Add /groups/:id/subgroups endpoint to APIWinnie Hellmann2017-11-094-26/+230
|/ / / / /
* | | | | 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
| |/ / / / / /