summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | Merge branch 'jivl-add-missing-strings-tag-page' into 'master'Tim Zallmann2017-11-081-3/+3
|\ \ \ \ \
| * | | | | Added missing strings to prepare the tags page for internationalizationjivl-add-missing-strings-tag-pageJose Ivan Vargas2017-11-071-3/+3
* | | | | | Merge branch 'qa/gb/add-qa-internal-tests-to-the-pipeline' into 'master'Rémy Coutable2017-11-081-0/+10
|\ \ \ \ \ \
| * | | | | | Add Internal QA specs to the pipelineGrzegorz Bizon2017-11-081-0/+10
|/ / / / / /
* | | | | | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-086-16/+12
|\ \ \ \ \ \
| * | | | | | Updates tests to reflect sign_out route changeJoe Marty2017-11-073-14/+5
| * | | | | | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-063-2/+7
* | | | | | | 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
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ux-guide-components-modal' into 'master'Marcia Ramos2017-11-085-0/+33
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Changed the order of buttons from left to rightux-guide-components-modalHazel2017-11-061-1/+2
| * | | | | | | | | Modify the sentences and add TodoHazel2017-11-021-2/+4
| * | | | | | | | | Modified the font family in the imagesHazel2017-10-186-1/+1
| * | | | | | | | | Updated the sytle part - changed the order of header, body, and actionsHazel2017-10-171-3/+3
| * | | | | | | | | Updated the content and added the imagesHazel2017-10-176-11/+12