summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-authorize-admin-oauth-application' into 'master'10-2-stable-prepare-rc2Sean McGivern2017-11-142-5/+14
* Merge branch 'fix-subgroup-autocomplete' into 'master'Rémy Coutable2017-11-143-1/+21
* Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ...Sean McGivern2017-11-144-27/+29
* Update VERSION to 10.2.0-rc1v10.2.0-rc1Winnie Hellmann2017-11-131-1/+1
* Merge branch '10-2-stable-prepare-rc1' into '10-2-stable'Winnie Hellmann2017-11-1336-106/+839
|\
| * Merge branch 'rc/gitlab-qa-89' into 'master'10-2-stable-prepare-rc1Grzegorz Bizon2017-11-1010-21/+40
| * Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse2017-11-102-1/+19
| * Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-101-4/+18
| * Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-103-5/+34
| * Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes2017-11-102-26/+29
| * Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-103-3/+36
| * Merge branch 'issue_39773_be' into 'master'Sean McGivern2017-11-103-11/+43
| * Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan2017-11-106-7/+50
| * Merge branch 'winh-installation-10-2-stable-docs' into 'master'Oswaldo Ferreira2017-11-101-2/+2
| * Merge branch 'winh-update-10-2-docs' into 'master'Oswaldo Ferreira2017-11-101-0/+360
| * Merge branch 'winh-templates-10-2' into 'master'Oswaldo Ferreira2017-11-103-3/+3
| * Merge branch 'winh-update-licenses-10-2' into 'master'Oswaldo Ferreira2017-11-101-23/+205
|/
* Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'Stan Hu2017-11-092-5/+6
* Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-094-10/+27
* Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-093-28/+137
* Merge branch 'fix/doc/39935-missing-fields-in-merge-request-payload' into 'ma...Achilleas Pipinellis2017-11-091-0/+6
* Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-093-6/+46
* Merge branch 'remove-ineffective-service-specs' into 'master'Filipa Lacerda2017-11-092-113/+0
* Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable2017-11-095-28/+69
* Merge branch 'update-upload-documentation' into 'master'Nick Thomas2017-11-092-10/+59
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-0911-29/+16
* Merge branch 'bvl-update-externalization-docs' into 'master'Achilleas Pipinellis2017-11-091-15/+12
* Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes2017-11-096-174/+204
* Merge branch 'rc-fixup-mattermost-test-runner' into 'master'Grzegorz Bizon2017-11-091-2/+2
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-09186-1294/+9142
* Merge branch 'jivl-add-missing-strings-tag-page' into 'master'Tim Zallmann2017-11-091-3/+3
* Merge branch 'qa/gb/add-qa-internal-tests-to-the-pipeline' into 'master'Rémy Coutable2017-11-091-0/+10
* Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-096-16/+12
* Merge branch 'fl-cleanup-test' into 'master'Tim Zallmann2017-11-081-23/+0
|\
| * Update mr_widget_options_spec.jsfl-cleanup-testFilipa Lacerda2017-11-071-1/+0
| * Cleanup testsFilipa Lacerda2017-11-071-22/+0
* | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-083-1/+14
|\ \
| * | When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-073-1/+14
* | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-0810-111/+205
|\ \ \
| * | | Remove EE-specific group pathsbvl-free-pathsBob Van Landuyt2017-11-072-19/+3
| * | | Check redirecting with a querystringBob Van Landuyt2017-11-072-2/+14
| * | | Update failure message when finding new routes in `PathRegex`Bob Van Landuyt2017-11-071-9/+4
| * | | Free up some group reserved wordsBob Van Landuyt2017-11-077-61/+100
| * | | Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-075-73/+87
| * | | Free up `labels` as a group nameBob Van Landuyt2017-11-073-5/+28
| * | | Add helper methods to redirect legacy pathsBob Van Landuyt2017-11-073-0/+27
* | | | Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'ma...Stan Hu2017-11-082-2/+6
|\ \ \ \
| * | | | Make BackgroundTransaction#labels publicPawel Chojnacki2017-11-072-2/+6
* | | | | Merge branch 'jivl-fix-karma-config-file' into 'master'Mike Greiling2017-11-081-9/+0
|\ \ \ \ \
| * | | | | fix karma config filejivl-fix-karma-config-fileJose Ivan Vargas2017-11-071-9/+0