summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-buildRémy Coutable2018-06-201-0/+4
* Merge branch 'docs/48075-milestone-labels-can-be-confusing' into 'master'47964-custom-logo-rendering-improperly-on-sign-in-pageMek Stittri2018-06-201-5/+5
|\
| * Resolve conflicts with latest workflow label changesMek Stittri2018-06-20138-804/+1210
| |\ | |/ |/|
* | Merge branch 'bvl-errors-in-static-analysis' into 'master'Sean McGivern2018-06-202-13/+30
|\ \
| * | More verbose errors in static-analysisBob Van Landuyt2018-06-202-13/+30
* | | Merge branch 'zj-can-be-merged' into 'master'Douwe Maan2018-06-203-44/+21
|\ \ \
| * | | Move mergablility check to Gitalyzj-can-be-mergedZeger-Jan van de Weg2018-06-203-44/+21
* | | | Merge branch 'fix/favicon-cross-origin' into 'master'Douwe Maan2018-06-203-5/+35
|\ \ \ \
| * | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues w...Alexis Reigel2018-06-203-5/+35
|/ / / /
* | | | Merge branch '47631-operations-kubernetes-option-is-always-visible-when-repos...Rémy Coutable2018-06-203-0/+44
|\ \ \ \
| * | | | Operations and Kubernetes items are now omitted in the sidebar when repositor...47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabledTiago Botelho2018-06-203-0/+44
* | | | | Merge branch 'sh-bump-rugged-0.27.2' into 'master'Rémy Coutable2018-06-202-1/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bump rugged to 0.27.2sh-bump-rugged-0.27.2Stan Hu2018-06-202-1/+6
* | | | | Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-w...Rémy Coutable2018-06-202-0/+12
|\ \ \ \ \
| * | | | | [Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routesblackst0ne2018-06-202-0/+12
* | | | | | Merge branch 'docs/profile-preferences' into 'master'Marcia Ramos2018-06-201-17/+9
|\ \ \ \ \ \
| * | | | | | Refactor the profile preferences docsAchilleas Pipinellis2018-06-201-17/+9
* | | | | | | Merge branch 'docs-clarify-API-share-project-to-group' into 'master'Achilleas Pipinellis2018-06-202-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Docs clarify API to share project to a groupdocs-clarify-API-share-project-to-groupAndrew Winata2018-06-012-1/+5
* | | | | | | | Merge branch '48126-fix-prometheus-installation' into 'master'Kamil Trzciński (Conference till 20th)2018-06-209-34/+59
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible...Mayra Cabrera2018-06-209-34/+59
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \