Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
163bc48e059d
Commit
fd41e399
authored
Jan 18, 2015
by
Dmitriy Zaporozhets
Browse files
Votes block has less priority than assignee/milestone
parent
74b63bd1f44c
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/views/projects/issues/_discussion.html.haml
View file @
163bc48e
...
...
@@ -19,14 +19,14 @@
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
=
cross_project_reference
(
@project
,
@issue
)
%hr
.context
%cite
.cgray
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
%hr
.clearfix
.votes-holder
%h6
Votes
#votes
=
render
'votes/votes_block'
,
votable:
@issue
%hr
.context
%cite
.cgray
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
-
if
@issue
.
labels
.
any?
%hr
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
163bc48e
...
...
@@ -14,13 +14,13 @@
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
=
cross_project_reference
(
@project
,
@merge_request
)
%hr
.votes-holder.hidden-sm.hidden-xs
%h6
Votes
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
%hr
.context
%cite
.cgray
=
render
partial:
'projects/merge_requests/show/context'
,
locals:
{
merge_request:
@merge_request
}
%hr
.votes-holder.hidden-sm.hidden-xs
%h6
Votes
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
-
if
@merge_request
.
labels
.
any?
%hr
...
...
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