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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
fd41e399
Commit
fd41e399
authored
Jan 18, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Votes block has less priority than assignee/milestone
parent
3a46ea4c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+4
-4
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+4
-4
No files found.
app/views/projects/issues/_discussion.html.haml
View file @
fd41e399
...
@@ -19,14 +19,14 @@
...
@@ -19,14 +19,14 @@
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
=
cross_project_reference
(
@project
,
@issue
)
=
cross_project_reference
(
@project
,
@issue
)
%hr
%hr
.context
%cite
.cgray
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
%hr
.clearfix
.clearfix
.votes-holder
.votes-holder
%h6
Votes
%h6
Votes
#votes
=
render
'votes/votes_block'
,
votable:
@issue
#votes
=
render
'votes/votes_block'
,
votable:
@issue
%hr
.context
%cite
.cgray
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
-
if
@issue
.
labels
.
any?
-
if
@issue
.
labels
.
any?
%hr
%hr
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
fd41e399
...
@@ -14,13 +14,13 @@
...
@@ -14,13 +14,13 @@
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
%span
.slead.has_tooltip
{
:"data-original-title"
=>
'Cross-project reference'
}
=
cross_project_reference
(
@project
,
@merge_request
)
=
cross_project_reference
(
@project
,
@merge_request
)
%hr
%hr
.votes-holder.hidden-sm.hidden-xs
%h6
Votes
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
%hr
.context
.context
%cite
.cgray
%cite
.cgray
=
render
partial:
'projects/merge_requests/show/context'
,
locals:
{
merge_request:
@merge_request
}
=
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?
-
if
@merge_request
.
labels
.
any?
%hr
%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