Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into add-ingress-to-cluster-applications2017-11-07T16:54:03+00:00Kamil Trzcinskiayufan@ayufan.eu2017-11-07T16:54:03+00:00e957ea4ae1dac758c3510288b2ac2a2992cd4f7e
Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications2017-11-07T13:54:45+00:00Kamil Trzcinskiayufan@ayufan.eu2017-11-07T13:54:45+00:0046bc6b5d8fd934823a28a358cb57b8e098352499
Merge branch 'master' into 38464-k8s-apps2017-11-07T12:23:54+00:00Shinya Maedashinya@gitlab.com2017-11-07T12:23:54+00:00bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078
Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'2017-11-07T10:59:38+00:00Rémy Coutableremy@rymai.me2017-11-07T10:59:38+00:0031e3ef93e53802bb99b342a7b403972493ed63cc
Support custom attributes on groups and projects
See merge request gitlab-org/gitlab-ce!14593
Support custom attributes on groups and projects
See merge request gitlab-org/gitlab-ce!14593
Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications2017-11-06T23:07:17+00:00Eric Eastwoodcontact@ericeastwood.com2017-11-06T23:07:17+00:00fd9be1dd1f077a33e5ab15e8273fb726cbbc6fcc
Merge branch 'master' into 38464-k8s-apps2017-11-06T23:03:31+00:00Eric Eastwoodcontact@ericeastwood.com2017-11-06T23:03:31+00:00a46d32412ec93be2d6d10bd4bcbdd23b69d31865
Conflicts:
db/schema.rb
Conflicts:
db/schema.rb
Merge branch 'refactor-clusters' into 'master'2017-11-06T21:21:27+00:00Grzegorz Bizongrzegorz@gitlab.com2017-11-06T21:21:27+00:00c71cf908cd4f289248598d9ea1c144c7b65cbb94
Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform
See merge request gitlab-org/gitlab-ce!14879
Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform
See merge request gitlab-org/gitlab-ce!14879