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
1b5302f8
Commit
1b5302f8
authored
Dec 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce MR/issue duplication
parent
90a46535
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+1
-4
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+2
-2
app/views/shared/issuable/_participants.html.haml
app/views/shared/issuable/_participants.html.haml
+2
-1
No files found.
app/views/projects/issues/_discussion.html.haml
View file @
1b5302f8
...
@@ -12,10 +12,7 @@
...
@@ -12,10 +12,7 @@
.col-md-9
.col-md-9
.votes-holder.pull-right
.votes-holder.pull-right
#votes
=
render
'votes/votes_block'
,
votable:
@issue
#votes
=
render
'votes/votes_block'
,
votable:
@issue
.participants
=
render
"shared/issuable/participants"
%span
=
pluralize
(
@participants
.
count
,
'participant'
)
-
@participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
.col-md-3
.col-md-3
.input-group.cross-project-reference
.input-group.cross-project-reference
%span
#cross-project-reference
.slead.has_tooltip
{
title:
'Cross-project reference'
}
%span
#cross-project-reference
.slead.has_tooltip
{
title:
'Cross-project reference'
}
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
1b5302f8
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
.col-md-9
.col-md-9
.votes-holder.pull-right
.votes-holder.pull-right
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
=
render
"
projects/merge_requests/show
/participants"
=
render
"
shared/issuable
/participants"
.col-md-3
.col-md-3
.input-group.cross-project-reference
.input-group.cross-project-reference
%span
#cross-project-reference
.slead.has_tooltip
{
title:
'Cross-project reference'
}
%span
#cross-project-reference
.slead.has_tooltip
{
title:
'Cross-project reference'
}
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
.row
.row
%section
.col-md-9
%section
.col-md-9
=
render
"projects/notes/notes_with_form"
.voting_notes
#notes
=
render
"projects/notes/notes_with_form"
%aside
.col-md-3
%aside
.col-md-3
.issuable-affix
.issuable-affix
.context
.context
...
...
app/views/
projects/merge_requests/show
/_participants.html.haml
→
app/views/
shared/issuable
/_participants.html.haml
View file @
1b5302f8
.participants
.participants
%span
#{
@participants
.
count
}
participants
%span
=
pluralize
@participants
.
count
,
"participant"
-
@participants
.
each
do
|
participant
|
-
@participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
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