Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
da89ebbe
Commit
da89ebbe
authored
Apr 17, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix label color input.
parent
a66953b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/models/label.rb
app/models/label.rb
+2
-0
app/views/projects/labels/_form.html.haml
app/views/projects/labels/_form.html.haml
+1
-1
No files found.
app/models/label.rb
View file @
da89ebbe
...
...
@@ -13,6 +13,8 @@
class
Label
<
ActiveRecord
::
Base
DEFAULT_COLOR
=
'#428BCA'
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'
...
...
app/views/projects/labels/_form.html.haml
View file @
da89ebbe
...
...
@@ -16,7 +16,7 @@
.col-sm-10
.input-group
.input-group-addon.label-color-preview
=
f
.
color_field
:color
,
value:
"#AA33EE"
,
class:
"form-control"
=
f
.
color_field
:color
,
class:
"form-control"
.help-block
Choose any color.
%br
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment