summaryrefslogtreecommitdiff
path: root/app/models/clusters
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-062-4/+7
|\
| * Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-061-1/+1
| * Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-051-1/+5
| * use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-021-2/+1
* | use find_or_initialize to fetch prometheus_service instancePawel Chojnacki2018-02-061-1/+1
* | remove unnecessary commentPawel Chojnacki2018-02-061-1/+0
* | Test Prometheus proxy client generationPawel Chojnacki2018-01-041-2/+7
* | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-0/+3
* | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-041-0/+9
* | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-021-4/+11
* | wipPawel Chojnacki2018-01-021-0/+12
|/
* Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-225-38/+64
* Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus...Kamil Trzcinski2017-12-051-5/+0
|\
| * Remove duplicated validations on cluster_nameShinya Maeda2017-12-041-5/+0
* | Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-031-0/+4
|\ \ | |/ |/|
| * Add created? to Cluster modelMatija Čupić2017-12-011-0/+4
* | Fix prevent modificationKamil Trzcinski2017-12-031-0/+14
* | Fix controllers and linksKamil Trzcinski2017-12-031-3/+6
* | Extend controllers to support a new data structure for manual Kubernetes clus...Kamil Trzcinski2017-12-031-0/+6
* | Fix static analysysShinya Maeda2017-11-281-0/+1
* | Fix unit testsShinya Maeda2017-11-281-1/+3
* | Remove logic which glues with KubernetesService, from Platforms::KubernetesShinya Maeda2017-11-282-57/+3
* | Check diff between KubernetesService and Platforms::Kubernetes. Synchronize a...Shinya Maeda2017-11-281-67/+57
* | Revert KubernetesService logic in Platforms::KubernetesShinya Maeda2017-11-281-0/+123
|/
* Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+1
* Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-071-1/+1
|\
| * Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-081-1/+1
| |\
| | * Change new occurrencies of n1-default-439649-change-default-size-for-gke-cluster-creationbikebilly2017-11-071-1/+1
* | | Make ingress to use install_commandKamil Trzcinski2017-11-071-0/+4
* | | Merge remote-tracking branch 'origin/38464-k8s-apps' into add-ingress-to-clus...Kamil Trzcinski2017-11-071-0/+4
|\ \ \ | |/ /
| * | Add Helm InstallCommandAlessio Caiazza2017-11-071-0/+4
* | | Fix ingress.rbKamil Trzcinski2017-11-071-0/+2
* | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-072-3/+5
|\ \ \ | |/ /
| * | 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
* | | Fix initial status againKamil Trzcinski2017-11-073-13/+9
* | | Fix initial_statusKamil Trzcinski2017-11-071-4/+6
* | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-072-12/+14
|\ \ \ | |/ /
| * | Rework initial stateKamil Trzcinski2017-11-072-5/+7
| * | 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' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-063-3/+3
|\ \ \ | |/ /
| * | Merge branch '36629-35958-add-cluster-application-section' into '38464-k8s-apps'Kamil Trzciński2017-11-064-0/+14
| |\ \
| | * | Fix small error [ci skip]Kamil Trzcinski2017-11-061-1/+1
| | * | Add active? to Platforms::KubernetesKamil Trzcinski2017-11-061-0/+4
| | * | Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-063-2/+10
| * | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-061-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-061-1/+1
View Lorry Controller Status