diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/projects.scss | 1 | ||||
| -rw-r--r-- | db/migrate/20140729152420_migrate_taggable_labels.rb | 6 |
4 files changed, 6 insertions, 5 deletions
@@ -1 +1 @@ -7.2.0.rc1 +7.2.0.rc2 diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index a463a2eb194..e5e62c87e40 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -50,7 +50,7 @@ class Dispatcher new TreeView() when 'projects:blob:show' new BlobView() - when 'projects:labels:new' + when 'projects:labels:new', 'projects:labels:edit' new Labels() switch path.first() diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 6757cbd30f6..6e34f736ac9 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -192,6 +192,7 @@ ul.nav.nav-projects-tabs { background-image: none; .btn, &.btn { + white-space: normal; text-align: left; padding: 10px 15px; background-color: #F1f1f1; 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' |