summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-01-05 15:22:45 +0900
committerShinya Maeda <shinya@gitlab.com>2018-01-08 16:22:18 +0900
commitacfb8464bef7b43b730ddf433a8223fc240d968a (patch)
tree5a377e2f938c0544a9211e76d63979e843571775 /db
parentb8a275d3e46a4204505ed5a4b7a9b3a6d49c9b4f (diff)
downloadgitlab-ce-acfb8464bef7b43b730ddf433a8223fc240d968a.tar.gz
Fix static anylysy
Diffstat (limited to 'db')
-rw-r--r--db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb b/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb
index f2455a3d8b0..5ea115cea90 100644
--- a/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb
+++ b/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb
@@ -66,7 +66,7 @@ class MigrateKubernetesServiceToNewClustersArchitectures < ActiveRecord::Migrati
.where("services.properties LIKE CONCAT('%', cluster_platforms_kubernetes.api_url, '%')")
.select('1') )
.order(project_id: :asc)
- end
+ end
scope :kubernetes_service_without_template, -> do
where(category: 'deployment')
@@ -85,9 +85,10 @@ class MigrateKubernetesServiceToNewClustersArchitectures < ActiveRecord::Migrati
unique_iid = 0
# If it's still conflicted, finding an unique environment scope incrementaly
- while true
+ loop do
candidate = "migrated#{unique_iid}/*"
return candidate if environment_scopes.exclude?(candidate)
+
unique_iid += 1
end
end