Commit Graph

6 Commits

Author SHA1 Message Date
GitLab Bot e58ce90f14 Add latest changes from gitlab-org/gitlab@master 2021-06-11 18:10:13 +00:00
GitLab Bot bdca097916 Add latest changes from gitlab-org/gitlab@master 2020-08-11 03:11:00 +00:00
GitLab Bot c59765a50a Add latest changes from gitlab-org/gitlab@master 2020-06-24 18:09:03 +00:00
GitLab Bot fca89bb73f Add latest changes from gitlab-org/gitlab@master 2020-03-11 21:09:19 +00:00
James Fargher c234e73123 When an instance cluster already exists migrate disabled
Assume that if an instance level cluster already exists, then the
KubernetesService was not being used, but allow the admin to re-enable
it if required
2019-05-30 13:22:50 +01:00
James Fargher f26884a0a8 Migrate Kubernetes service integration templates to clusters
The migration uses active record model stubs so that field encryption
can be more easily used.
2019-05-30 13:22:49 +01:00