summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-0317-358/+235
|\
| * Merge branch 'master' into refactor-clustersEric Eastwood2017-11-0313-34/+85
| |\
| * | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-036-8/+16
| * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-03252-1867/+2376
| |\ \
| * | | Fix some testsShinya Maeda2017-11-039-288/+185
| * | | Fix out of sync with KubernetesService. Remove namespace pramas from controll...Shinya Maeda2017-11-027-71/+34
| * | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i...Shinya Maeda2017-11-021-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-02203-1987/+1962
| |\ \ \ \
* | | | | | Remove `Clusters::Applications::FetchInstallationStatusService`Alessio Caiazza2017-11-036-38/+60
* | | | | | Rename App to ApplicationsAlessio Caiazza2017-11-0315-122/+126
* | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0313-34/+85
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'gitaly-client-path-fix' into 'master'Douwe Maan2017-11-031-1/+1
| |\ \ \ \ \
| | * | | | | Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
| * | | | | | Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon2017-11-033-1/+25
| |\ \ \ \ \ \
| | * | | | | | Avoid regenerating the ref path for the environmentsh-fix-environment-slug-generationStan Hu2017-11-023-1/+25
| * | | | | | | Merge branch '39684-issue-boards-space' into 'master'Phil Hughes2017-11-031-3/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Remove white space at bottom of issue boards39684-issue-boards-spaceAnnabel Dunstone Gray2017-11-021-3/+7
| * | | | | | | | Merge branch '39726-add-crsf-token-axios' into 'master'Phil Hughes2017-11-032-0/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add crsf token in axios calls39726-add-crsf-token-axiosFilipa Lacerda2017-11-022-0/+8
| * | | | | | | | | Merge branch 'refactor-services-for-audit-events-ce' into 'master'Grzegorz Bizon2017-11-036-29/+44
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | fix typorefactor-services-for-audit-events-ceJames Lopez2017-11-021-1/+1
| | * | | | | | | | fix specsJames Lopez2017-11-021-1/+1
| | * | | | | | | | fix specsJames Lopez2017-11-022-2/+3
| | * | | | | | | | refactor codeJames Lopez2017-10-313-4/+3
| | * | | | | | | | fix spinach failureJames Lopez2017-10-311-0/+2
| | * | | | | | | | fix specsJames Lopez2017-10-311-0/+0
| | * | | | | | | | fix specJames Lopez2017-10-311-2/+0
| | * | | | | | | | uypdated keys controller logicJames Lopez2017-10-312-8/+3
| | * | | | | | | | add applications controller logicJames Lopez2017-10-314-22/+42
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-03444-3853/+4337
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '39417-to-do-should-be-todos-on-todos-list-page' into 'master'Annabel Dunstone Gray2017-11-033-6/+11
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Resolve ""To do" should be "Todos" on Todos list page"Victor Wu2017-11-033-6/+11
| |/ / / / / / / /
| * | | | | | | | Merge branch 'jk-epic-changes-ce-port' into 'master'39748-add-documentation-on-how-to-create-a-dns-entry-docsStan Hu2017-11-021-2/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove including ee moduleJarka Kadlecova2017-11-021-2/+0
| * | | | | | | | | Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu2017-11-023-13/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730Pawel Chojnacki2017-11-023-13/+6
| * | | | | | | | | | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int...Yorick Peterse2017-11-027-1/+128
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Set merge_request_diff_id on MR when creatingSean McGivern2017-11-023-2/+6
| | * | | | | | | | | | Add a column linking an MR to its diffSean McGivern2017-11-026-1/+124
| * | | | | | | | | | | Merge branch 'refactor-responsive-tables-for-nested-error' into 'master'Annabel Dunstone Gray2017-11-027-77/+103
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Refactor responsive table styles to support nested error blockrefactor-responsive-tables-for-nested-errorEric Eastwood2017-11-027-77/+103
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'gitaly-ff-merge' into 'master'Rémy Coutable2017-11-025-30/+115
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-mergeAlejandro Rodríguez2017-10-315-30/+115
| * | | | | | | | | | | | Merge branch 'winh-update-nvmrc' into 'master'Phil Hughes2017-11-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update .nvmrc to current stable (v9.0.0)winh-update-nvmrcWinnie Hellmann2017-11-021-1/+1
| * | | | | | | | | | | | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-0264-281/+293
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix for Dropdown Icon Positionicons-ci-iconsTim Zallmann2017-11-011-3/+3
| | * | | | | | | | | | | | | Needed to change 0px to 0Tim Zallmann2017-10-301-1/+1
| | * | | | | | | | | | | | | Missing Comma addedTim Zallmann2017-10-301-1/+1
| | * | | | | | | | | | | | | Fixed different sizesTim Zallmann2017-10-302-6/+33
View Lorry Controller Status