Commit d012648b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'fix-label-color-input' into 'master'

Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by f3d1b76835ea between 7.9 and 7.10, so no changelog item.

See merge request !538
......@@ -13,6 +13,8 @@
class Label < ActiveRecord::Base
default_value_for :color, DEFAULT_COLOR
belongs_to :project
has_many :label_links, dependent: :destroy
has_many :issues, through: :label_links, source: :target, source_type: 'Issue'
......@@ -16,7 +16,7 @@
.input-group-addon.label-color-preview &nbsp;
= f.color_field :color, value: "#AA33EE", class: "form-control"
= f.color_field :color, class: "form-control"
Choose any color.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment