summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0730-132/+970
|\
| * Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0837-193/+373
| |\
| * | Add Helm InstallCommandAlessio Caiazza2017-11-074-4/+12
| * | Fix tests for initial statusKamil Trzcinski2017-11-071-0/+2
| * | Fix initial status againKamil Trzcinski2017-11-072-7/+5
| * | Do not use %i() in state machinesAlessio Caiazza2017-11-071-3/+3
| * | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-075-11/+12
| |\ \
| | * | Rework initial stateKamil Trzcinski2017-11-072-5/+7
| | * | Use flash for dismissable alertsEric Eastwood2017-11-072-5/+4
| | * | Update Cluster application install to be enabled when erroredEric Eastwood2017-11-071-1/+1
| * | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0733-124/+296
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-071-7/+7
| |\ \ \
| | * | | More restrictive state machine transitions in Clusters::ApplicationStatusAlessio Caiazza2017-11-071-7/+7
| * | | | Fix static analysys in app/models/clusters/applications/helm.rb:15Shinya Maeda2017-11-071-1/+1
| |/ / /
| * | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-0724-186/+702
| |\ \ \
| | * | | Remove Clusters::Applications::FinalizeInstallationServiceAlessio Caiazza2017-11-072-18/+23
| | * | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0696-558/+604
| | |\ \ \
| | * | | | Fix comma dangle eslint in application_row.vueEric Eastwood2017-11-061-1/+1
| | * | | | Merge branch '36629-35958-add-cluster-application-section' into '38464-k8s-apps'Kamil Trzciński2017-11-0617-130/+664
| | |\ \ \ \
| | | * | | | Fix small error [ci skip]Kamil Trzcinski2017-11-061-1/+1
| | | * | | | I18n general app error and update attributes from reviewEric Eastwood2017-11-062-10/+20
| | | * | | | Add FE tests for not_installable/scheduled and cluster banner rules36629-35958-add-cluster-application-sectionEric Eastwood2017-11-064-22/+36
| | | * | | | Add active? to Platforms::KubernetesKamil Trzcinski2017-11-061-0/+4
| | | * | | | Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-066-5/+21
| | | * | | | Return empty applications if not Kubernetes [ci skip]Kamil Trzcinski2017-11-061-0/+2
| | | * | | | Remove not used ingress and runnerKamil Trzcinski2017-11-063-9/+1
| | | * | | | Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-...Kamil Trzcinski2017-11-0651-691/+849
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/38464-k8s-apps' into 36629-35958-add-clu...Kamil Trzcinski2017-11-064-6/+8
| | | |\ \ \ \ \
| | | * | | | | | Add applications section to GKE clusters pageEric Eastwood2017-11-0313-131/+627
| | * | | | | | | Add more tests to Projects::Clusters::ApplicationsController38464-k8s-appsAlessio Caiazza2017-11-061-8/+6
| | * | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-069-58/+19
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add ClusterApplicationEntity testsAlessio Caiazza2017-11-062-2/+2
| | * | | | | | | | Add Clusters::Applications services testsAlessio Caiazza2017-11-065-32/+11
| | * | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-0651-694/+852
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Add Clusters::Appplications::CheckInstallationProgressService testsAlessio Caiazza2017-11-061-2/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-07132-1091/+1264
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add Clusters::Applications::Helm testsAlessio Caiazza2017-11-033-5/+7
| * | | | | | | | Add Projects::Clusters::ApplicationsController testsAlessio Caiazza2017-11-031-1/+1
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Fix typosAlessio Caiazza2017-11-033-13/+9
| * | | | | | | Schedule k8s application installation with a serviceAlessio Caiazza2017-11-034-9/+42
| * | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-035-41/+32
| |\ \ \ \ \ \ \
| * | | | | | | | Remove `Clusters::Applications::FetchInstallationStatusService`Alessio Caiazza2017-11-035-38/+48
| * | | | | | | | Rename App to ApplicationsAlessio Caiazza2017-11-0315-122/+126
| * | | | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-039-33/+51
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-03102-1092/+1241
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix nitpicksKamil Trzcinski2017-11-032-2/+2
| * | | | | | | | | | Expose applications as array via APIKamil Trzcinski2017-11-024-12/+13
| * | | | | | | | | | Extract ClusterWaitForAppInstallationWorker logic into a serviceAlessio Caiazza2017-11-023-20/+30
| * | | | | | | | | | Fix rubocop offensesAlessio Caiazza2017-11-022-2/+2
| * | | | | | | | | | General cleanupAlessio Caiazza2017-11-024-27/+2
View Lorry Controller Status