summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Test: Delete uploads after commitjprovazn-uploads2Jan Provaznik2018-06-202-9/+10
* Merge branch 'leipert-proper-eslint-report' into 'master'Mike Greiling2018-06-192-3/+1
|\
| * use eslint config parameter instead of sedleipert-proper-eslint-reportLukas Eipert2018-06-162-3/+1
* | Merge branch '46250-remove-commented-from-comment-system-notes' into 'master'Mike Greiling2018-06-193-4/+0
|\ \
| * | Resolve "Remove “commented” from comment system notes"Constance Okoghenun2018-06-193-4/+0
|/ /
* | Merge branch 'jl-update-jupyterhub-docs' into 'master'Marcia Ramos2018-06-191-1/+1
|\ \
| * | Clarify jupyterhub docs to indicate OAuth is enabled and HTTPS is not yet sup...jl-update-jupyterhub-docsJoshua Lambert2018-06-191-1/+1
* | | Merge branch 'qa-improve-main-login-page' into 'master'bjk/gh_importer_labelsRobert Speicher2018-06-192-31/+37
|\ \ \
| * | | Make Page::Main::Login#sign_in_using_credentials gracefully bail out when use...qa-improve-main-login-pageRémy Coutable2018-06-192-31/+37
* | | | Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'Clement Ho2018-06-191-0/+1
|\ \ \ \
| * | | | Fix cancel automatic merge button heightJose2018-06-191-0/+1
* | | | | Merge branch 'dm-branch-api-can-push' into 'master'Robert Speicher2018-06-194-4/+19
|\ \ \ \ \
| * | | | | Expose whether current user can push into a branch on branches APIdm-branch-api-can-pushDouwe Maan2018-06-184-4/+19
* | | | | | Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'Tim Zallmann2018-06-192-0/+6
|\ \ \ \ \ \
| * | | | | | Fix missing underline on focus states for anchor tagsjivl-fix-focused-links-missing-underlineJose2018-06-152-0/+6
* | | | | | | Merge branch 'fix-flakey-groups-filter-list-specs' into 'master'Rémy Coutable2018-06-192-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix flakey time-senstive group filter specsfix-flakey-groups-filter-list-specsEric Eastwood2018-06-142-0/+8
* | | | | | | | Merge branch '48047-project-integrations' into 'master'Clement Ho2018-06-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix integration table widths48047-project-integrationsAnnabel Dunstone Gray2018-06-181-1/+1
* | | | | | | | | Merge branch 'zj-force-push-opt-out' into 'master'Douwe Maan2018-06-195-46/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Force push is handled by Gitaly nowzj-force-push-opt-outZeger-Jan van de Weg2018-06-195-46/+11
* | | | | | | | | | Merge branch 'zj-fork-mandatory' into 'master'Douwe Maan2018-06-194-71/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Move forking to Gitalyzj-fork-mandatoryZeger-Jan van de Weg2018-06-194-71/+16
* | | | | | | | | | Merge branch 'zj-counting-commits' into 'master'Douwe Maan2018-06-193-80/+18
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Counting commits is done by Gitalyzj-counting-commitsZeger-Jan van de Weg2018-06-193-80/+18
* | | | | | | | | | Merge branch '45487-slack-tag-push-notifs' into 'master'Sean McGivern2018-06-193-17/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ChatNotificationService - fix sending tag notifications when "only default br...45487-slack-tag-push-notifsMario de la Ossa2018-06-143-17/+70
* | | | | | | | | | | Merge branch 'sh-optimize-locks-check-ce' into 'master'Sean McGivern2018-06-195-1/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Eliminate N+1 queries in LFS file locks checks during a pushsh-optimize-locks-check-ceStan Hu2018-06-185-1/+44
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'more-group-api-sorting-options' into 'master'Douwe Maan2018-06-195-8/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add id as second sort parameter for group sort by nameMarko, Peter2018-06-183-2/+38
| * | | | | | | | | | | Ensure ordering for group sorting testsMarko, Peter2018-06-151-4/+4
| * | | | | | | | | | | Add id group api sorting optionMarko, Peter2018-06-124-7/+23
* | | | | | | | | | | | Merge branch 'extra-ee-specific-lines-from-discussion-views' into 'master'Rémy Coutable2018-06-197-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-viewsSean McGivern2018-06-182-1/+3
| * | | | | | | | | | | | Remove EE-specific code from rejection mailerSean McGivern2018-06-182-0/+2
| * | | | | | | | | | | | Remove EE-specific code from logs tree dropdownSean McGivern2018-06-181-0/+2
| * | | | | | | | | | | | Remove EE-specific code from project milestone pageSean McGivern2018-06-181-0/+2
| * | | | | | | | | | | | Remove EE-specific code from blob headerSean McGivern2018-06-181-0/+2
* | | | | | | | | | | | | Merge branch 'docs/contributing-md-labels' into 'master'Rémy Coutable2018-06-191-34/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove label examples from headingsAchilleas Pipinellis2018-06-191-34/+48
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zj-linguist-gitaly-mandatory' into 'master'Douwe Maan2018-06-191-27/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move language detection to mandatoryZeger-Jan van de Weg2018-06-191-27/+19
* | | | | | | | | | | | | | Merge branch 'zj-gitaly-squash' into 'master'Douwe Maan2018-06-191-27/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Rebase and Squash in progress are Gitaly onlyZeger-Jan van de Weg2018-06-191-27/+4
* | | | | | | | | | | | | | | Merge branch 'zj-info-attributes' into 'master'Douwe Maan2018-06-191-15/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Move info attributes to mandatoryZeger-Jan van de Weg2018-06-191-15/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'zj-commit-count' into 'master'Douwe Maan2018-06-191-18/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Move count commit to mandatoryZeger-Jan van de Weg2018-06-191-18/+2
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'zj-gitaly-license-detection' into 'master'Douwe Maan2018-06-192-31/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \