Eric Eastwood 31cea03335 Merge branch '36629-35958-add-cluster-application-section' into add-ingress-to-cluster-applications ... Conflicts: app/assets/javascripts/clusters/clusters_bundle.js app/assets/javascripts/clusters/components/application_row.vue app/assets/javascripts/clusters/services/clusters_service.js		2017-11-06 10:14:29 -06:00
..
assets	Merge branch '36629-35958-add-cluster-application-section' into add-ingress-to-cluster-applications	2017-11-06 10:14:29 -06:00
controllers	Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-cluster-application-section	2017-11-06 10:10:06 +01:00
finders
helpers	Merge branch 'bvl-unlink-fixes' into 'master'	2017-11-03 15:33:53 +00:00
mailers
models	Add active? to Platforms::Kubernetes	2017-11-06 15:52:21 +01:00
policies
presenters	Expose applications as array via API	2017-11-02 17:57:58 +01:00
serializers	Merge remote-tracking branch 'origin/master' into 38464-k8s-apps	2017-11-03 09:46:53 +01:00
services	Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-cluster-application-section	2017-11-06 10:10:06 +01:00
uploaders	Use the Hashed Storage compatible layer to store Attachments	2017-10-30 14:30:41 +01:00
validators
views	Remove not used ingress and runner	2017-11-06 10:50:10 +01:00
workers	Fix typos	2017-11-03 13:55:44 +01:00