From 7e0a2b3b3dac62541abf990ca633cb272c58d4cf Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 19 Aug 2014 17:42:34 +0200 Subject: [PATCH 1/3] Test if the label is valid before creating link --- db/migrate/20140729152420_migrate_taggable_labels.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20140729152420_migrate_taggable_labels.rb b/db/migrate/20140729152420_migrate_taggable_labels.rb index 0b844720ba1..06b60a1c92f 100644 --- a/db/migrate/20140729152420_migrate_taggable_labels.rb +++ b/db/migrate/20140729152420_migrate_taggable_labels.rb @@ -18,7 +18,7 @@ class MigrateTaggableLabels < ActiveRecord::Migration label_name = tagging.tag.name label = target.project.labels.find_or_create_by(title: label_name) - if LabelLink.create(label: label, target: target) + if label.valid? && LabelLink.create(label: label, target: target) print '.' else print 'F' -- GitLab From e354e548b9259cc5b6924459a3b797b573afbe00 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 19 Aug 2014 17:42:55 +0200 Subject: [PATCH 2/3] Remove invalid characters from the label name --- db/migrate/20140729152420_migrate_taggable_labels.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20140729152420_migrate_taggable_labels.rb b/db/migrate/20140729152420_migrate_taggable_labels.rb index 06b60a1c92f..6724be753c2 100644 --- a/db/migrate/20140729152420_migrate_taggable_labels.rb +++ b/db/migrate/20140729152420_migrate_taggable_labels.rb @@ -15,7 +15,7 @@ class MigrateTaggableLabels < ActiveRecord::Migration def create_label_from_tagging(tagging) target = tagging.taggable - label_name = tagging.tag.name + label_name = tagging.tag.name.tr('?&,', '') label = target.project.labels.find_or_create_by(title: label_name) if label.valid? && LabelLink.create(label: label, target: target) -- GitLab From dfc5bf6bf712b7d861cb793f87d1fe3292bde2de Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 19 Aug 2014 17:43:17 +0200 Subject: [PATCH 3/3] Use the default color when migrating labels --- db/migrate/20140729152420_migrate_taggable_labels.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20140729152420_migrate_taggable_labels.rb b/db/migrate/20140729152420_migrate_taggable_labels.rb index 6724be753c2..f747fd71536 100644 --- a/db/migrate/20140729152420_migrate_taggable_labels.rb +++ b/db/migrate/20140729152420_migrate_taggable_labels.rb @@ -16,7 +16,7 @@ class MigrateTaggableLabels < ActiveRecord::Migration def create_label_from_tagging(tagging) target = tagging.taggable label_name = tagging.tag.name.tr('?&,', '') - label = target.project.labels.find_or_create_by(title: label_name) + label = target.project.labels.find_or_create_by(title: label_name, color: Label::DEFAULT_COLOR) if label.valid? && LabelLink.create(label: label, target: target) print '.' -- GitLab