diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2014-08-19 20:19:46 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2014-08-19 20:19:46 +0400 |
| commit | 86491e65746c37b2db497980110a237cb730cafe (patch) | |
| tree | 40c3829fb5548db78cc5a7cb93cdedd111dafc9a | |
| parent | 0b3ebb6440420de714fe5066aba19ca77e8b1b8f (diff) | |
| parent | dfc5bf6bf712b7d861cb793f87d1fe3292bde2de (diff) | |
Merge branch 'fix_label_migration' into 'master'
Fix label migration
Failure to create any labels at all caused this DB migration to run for over 40
minutes during a gitlab.com deploy this morning. This change specifies a color f
or each new label and strips invalid characters from the label name.
See merge request !1024
| -rw-r--r-- | db/migrate/20140729152420_migrate_taggable_labels.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db/migrate/20140729152420_migrate_taggable_labels.rb b/db/migrate/20140729152420_migrate_taggable_labels.rb index 0b844720ba1..f747fd71536 100644 --- a/db/migrate/20140729152420_migrate_taggable_labels.rb +++ b/db/migrate/20140729152420_migrate_taggable_labels.rb @@ -15,10 +15,10 @@ class MigrateTaggableLabels < ActiveRecord::Migration def create_label_from_tagging(tagging) target = tagging.taggable - label_name = tagging.tag.name - label = target.project.labels.find_or_create_by(title: label_name) + label_name = tagging.tag.name.tr('?&,', '') + label = target.project.labels.find_or_create_by(title: label_name, color: Label::DEFAULT_COLOR) - if LabelLink.create(label: label, target: target) + if label.valid? && LabelLink.create(label: label, target: target) print '.' else print 'F' |