summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* clarify what "methods" aredocs-styleguidelines-navMarcia Ramos2018-06-201-3/+4
* Update styleguide.md with rules for navigation itemsMarcia Ramos2018-06-201-2/+15
* Merge branch 'gitaly-disk-access-5' into 'master'Douwe Maan2018-06-206-1/+9
|\
| * More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-206-1/+9
|/
* Merge branch 'ce-5024-filename-search' into 'master'Sean McGivern2018-06-208-6/+186
|\
| * Implement filtering by filename on code searchce-5024-filename-searchMario de la Ossa2018-06-198-6/+186
* | Merge branch '48105-git-version-detection-using-gitaly' into 'master'Sean McGivern2018-06-201-1/+1
|\ \
| * | Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitalyBalasankar "Balu" C2018-06-191-1/+1
* | | Merge branch '47959-rails5-redis-timewithzone' into 'master'Sean McGivern2018-06-201-1/+1
|\ \ \
| * | | Fix redis_cacheable deserialization47959-rails5-redis-timewithzoneMario de la Ossa2018-06-191-1/+1
* | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-201-1/+1
|\ \ \ \
| * | | | Point out the specific anchor inside the documentMatthieu Fronton2018-06-191-1/+1
* | | | | Merge branch 'zj-lfs-pointers' into 'master'Douwe Maan2018-06-202-94/+7
|\ \ \ \ \
| * | | | | LFS changes are detected by Gitalyzj-lfs-pointersZeger-Jan van de Weg2018-06-192-94/+7
| |/ / / /
* | | | | Merge branch 'text-expander-icon-update' into 'master'Tim Zallmann2018-06-206-7/+28
|\ \ \ \ \
| * | | | | Updated horizontal ellipsis icon for text-expanderConstance Okoghenun2018-06-206-7/+28
|/ / / / /
* | | | | Merge branch 'docs/correct-curl-syntax' into 'master'Stan Hu2018-06-201-4/+4
|\ \ \ \ \
| * | | | | Correct cURL syntaxHenrik Hüttemann2018-06-201-4/+4
|/ / / / /
* | | | | Merge branch '48025-branch-name-status-color-is-not-correct-anymore' into 'ma...Tim Zallmann2018-06-193-5/+9
|\ \ \ \ \
| * | | | | Resolve "Branch name status color is not correct anymore"Clement Ho2018-06-193-5/+9
|/ / / / /
* | | | | 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