summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Fix syntax error in initializers/fill_shardsDmitriy Zaporozhets2018-11-071-4/+3
* Merge branch 'revert-45b61a9e' into 'master'Nick Thomas2018-11-071-2/+3
|\
| * Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'mas...Douwe Maan2018-11-071-2/+3
* | Merge branch '52767-more-chaos-for-gitlab' into 'master'Sean McGivern2018-11-071-0/+7
|\ \
| * | Add documentation, secure routes, etcAndrew Newdigate2018-11-011-4/+6
| * | Leak memory, spin cpu and kill the processAndrew Newdigate2018-11-011-0/+3
| * | Adding chaos to GitLab through chaos endpointsAndrew Newdigate2018-11-011-0/+2
* | | Merge branch 'remove-asset-sync' into 'master'Marin Jankovski2018-11-071-31/+0
|\ \ \ | |_|/ |/| |
| * | Remove asset_sync gem and related coderemove-asset-syncBalasankar "Balu" C2018-10-251-31/+0
* | | Merge branch 'dz-add-packages-to-yml' into 'master'Marin Jankovski2018-11-061-0/+4
|\ \ \
| * | | Add packages section to CE config filedz-add-packages-to-ymlDmitriy Zaporozhets2018-10-051-0/+4
* | | | Squashed commit of the following:Shinya Maeda2018-11-061-0/+1
* | | | Allow concurrency when using PumaAndrew Newdigate2018-11-052-1/+3
* | | | Start tracking pool repositoriesNick Thomas2018-11-051-0/+1
* | | | Start tracking shards in the databaseNick Thomas2018-11-051-0/+3
* | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-022-14/+18
|\ \ \ \
| * | | | Resolve controller sharing concernThong Kuah2018-11-011-15/+13
| * | | | Abstract out project out of ClustersControllerThong Kuah2018-11-011-14/+16
| * | | | Convert clusters to use a top-level controllerThong Kuah2018-11-012-14/+18
* | | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-11-025-4/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher2018-11-011-1/+5
| |\ \ \ \ \
| | * | | | | Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-workingStan Hu2018-10-251-1/+5
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-011-1/+1
| |\ \ \ \ \
| | * | | | | Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
| * | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-312-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Resolve "Create new group: Rename form fields and update UI"Martin Wortschack2018-10-301-0/+2
| |/ / / /
* | | | | Merge branch 'security-kubeclient-ssrf' into 'master'Jan Provaznik2018-11-021-0/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Monkey kubeclient to not follow any redirects.Thong Kuah2018-10-261-0/+21
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2914-64/+212
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-291-3/+2
| |\ \ \
| | * | | Fix specsblackst0ne2018-10-261-1/+1
| | * | | Update other linksblackst0ne2018-10-261-1/+1
| | * | | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-231-2/+1
| * | | | Backport CE route changes for Ops Dashboard in EE5781-operations-homepage-mvc-routesPeter Leitzen2018-10-271-0/+1
| * | | | Extract EE only oauth routes and add testsLin Jen-Shin2018-10-261-0/+2
| * | | | Put EE routes in EE files under EE directoriesLin Jen-Shin2018-10-263-7/+6
| * | | | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-259-54/+200
| |\ \ \ \
| | * | | | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-259-54/+200
| | | |/ / | | |/| |
| * | | | Backport SSH host key detection code to CENick Thomas2018-10-251-0/+1
| |/ / /
* | | | Merge branch 'sh-fix-hipchat-ssrf' into 'master'Jan Provaznik2018-10-291-0/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Prevent SSRF attacks in HipChat integrationStan Hu2018-10-021-0/+14
* | | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-3/+0
| |/ / |/| |
* | | Allow to configure cache path for webpackKamil Trzciński2018-10-191-1/+1
* | | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-151-3/+0
|\ \ \
| * | | Remove Koding integration and documentationStan Hu2018-10-121-3/+0
* | | | Fix rubocop complaining about unicorn.rbBrett Walker2018-10-122-4/+4
|/ / /
* | | Remove Git circuit breakerZeger-Jan van de Weg2018-10-102-4/+1
* | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-053-0/+3
|\ \ \
| * | | Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-052-0/+2
| | |/ | |/|
| * | Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-051-0/+1
View Lorry Controller Status