summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into project_wiki_scenario_automationat.ramya/gitlab-ce-project_wiki_scenario_automationramyaa2018-06-2078-370/+593
|\
| * Merge branch 'docs/master-maintainer-note' into 'master'Marcia Ramos2018-06-201-1/+13
| |\
| | * Add note about Master/Maintainer roleAchilleas Pipinellis2018-06-201-1/+13
| * | Merge branch 'rails5-fix-48142' into 'master'Rémy Coutable2018-06-202-1/+6
| |\ \
| | * | Rails5 fix Admin::HooksControllerJasper Maes2018-06-202-1/+6
| * | | Merge branch '48100-fix-branch-not-shown' into 'master'Rémy Coutable2018-06-203-2/+24
| |\ \ \ | | |_|/ | |/| |
| | * | The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shownHiroyuki Sato2018-06-203-2/+24
| * | | Merge branch 'clear-up-background-type-change-docs' into 'master'Yorick Peterse2018-06-201-0/+47
| |\ \ \
| | * | | Add docs for the cleanup step of a background column type changeclear-up-background-type-change-docsSean McGivern2018-06-191-0/+47
| * | | | Merge branch 'rails5-fix-48141' into 'master'Rémy Coutable2018-06-202-1/+7
| |\ \ \ \
| | * | | | Rails5 fix expected: 0 times with any arguments received: 1 time with argume...Jasper Maes2018-06-202-1/+7
| | | |_|/ | | |/| |
| * | | | Merge branch 'go-1.10-source-installs' into 'master'Nick Thomas2018-06-202-11/+11
| |\ \ \ \
| | * | | | Use Go 1.10 for source installationsgo-1.10-source-installsJacob Vosmaer2018-06-192-11/+11
| * | | | | Merge branch 'use-backup-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-207-70/+119
| |\ \ \ \ \
| | * | | | | Move backup custom hooks up a leveluse-backup-custom-hooks-gitalyAhmad Hassan2018-06-201-4/+2
| | * | | | | Output done for wiki and repoAhmad Hassan2018-06-191-14/+3
| | * | | | | Migrate repo backup to gitalyAhmad Hassan2018-06-157-60/+122
| * | | | | | Merge branch 'rails5-fix-48104' into 'master'Rémy Coutable2018-06-202-1/+12
| |\ \ \ \ \ \
| | * | | | | | Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false})...Jasper Maes2018-06-192-1/+12
| * | | | | | | Merge branch 'rails5-fix-pages-controller' into 'master'Rémy Coutable2018-06-202-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Rails5 fix Projects::PagesController specJasper Maes2018-06-192-2/+7
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \