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
8b4e1d0c
Commit
8b4e1d0c
authored
Apr 19, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add/use Label#priority? and remove weird padding
parent
c9f23ffe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+2
-2
app/models/label.rb
app/models/label.rb
+4
-0
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+1
-1
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
8b4e1d0c
...
...
@@ -81,7 +81,7 @@
display
:
block
;
.description-text
{
margin
:
0
$gl-padding
10px
0
;
margin
:
0
0
10px
0
;
}
a
{
...
...
@@ -309,7 +309,7 @@
.label-links
{
list-style
:
none
;
padding
:
0
$gl-padding
0
0
;
padding
:
0
;
white-space
:
nowrap
;
}
...
...
app/models/label.rb
View file @
8b4e1d0c
...
...
@@ -137,6 +137,10 @@ class Label < ActiveRecord::Base
priority
.
try
(
:priority
)
end
def
priority?
priorities
.
present?
end
def
template?
template
end
...
...
app/views/shared/_label.html.haml
View file @
8b4e1d0c
...
...
@@ -5,7 +5,7 @@
-
show_label_merge_requests_link
=
show_label_issuables_link?
(
label
,
:merge_requests
,
project:
@project
)
-
show_label_issues_link
=
show_label_issuables_link?
(
label
,
:issues
,
project:
@project
)
%li
.label-list-item
{
class:
label
.
priorit
ies
.
present
?
?
''
:
'no-hand'
,
id:
label_css_id
,
data:
{
id:
label
.
id
}
}
%li
.label-list-item
{
class:
label
.
priorit
y
?
?
''
:
'no-hand'
,
id:
label_css_id
,
data:
{
id:
label
.
id
}
}
=
render
"shared/label_row"
,
label:
label
%ul
.label-actions-list
%li
.inline
...
...
app/views/shared/_label_row.html.haml
View file @
8b4e1d0c
...
...
@@ -17,6 +17,6 @@
·
%li
.label-link-item.inline
=
link_to_label
(
label
,
subject:
subject
,
type: :merge_request
)
{
'Merge requests'
}
-
if
label
.
priorit
ies
.
present
?
-
if
label
.
priorit
y
?
%li
.label-link-item.inline.prepend-left-10
.label-badge.label-badge-blue
Prioritized label
\ No newline at end of file
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