Skip to content

G
gitlab-ce
Commit 0e9d52f3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents bd97715a d012648b
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
app/models/label.rb
View file @ 0e9d52f3
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
class Label < ActiveRecord::Base class Label < ActiveRecord::Base
DEFAULT_COLOR = '#428BCA' DEFAULT_COLOR = '#428BCA'
default_value_for :color, DEFAULT_COLOR
belongs_to :project belongs_to :project
has_many :label_links, dependent: :destroy has_many :label_links, dependent: :destroy
has_many :issues, through: :label_links, source: :target, source_type: 'Issue' has_many :issues, through: :label_links, source: :target, source_type: 'Issue'
......
app/views/projects/labels/_form.html.haml
View file @ 0e9d52f3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.col-sm-10 .col-sm-10
.input-group .input-group
.input-group-addon.label-color-preview &nbsp; .input-group-addon.label-color-preview &nbsp;
= f.color_field :color, value: "#AA33EE", class: "form-control" = f.color_field :color, class: "form-control"
.help-block .help-block
Choose any color. Choose any color.
%br %br
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7