diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:57:49 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:06:54 +0100 |
| commit | 1b5302f8e7050c5c4cd4e7d4cc63be3cd3fbbcb5 (patch) | |
| tree | c5126efeacd499ae2847b0a0195d735d2ac094a0 | |
| parent | 90a46535935115cc3556d6bc0d282938758cd29a (diff) | |
| download | gitlab-ce-1b5302f8e7050c5c4cd4e7d4cc63be3cd3fbbcb5.tar.gz | |
Reduce MR/issue duplication
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_participants.html.haml (renamed from app/views/projects/merge_requests/show/_participants.html.haml) | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index b5f522f2079..21eee70b424 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -12,10 +12,7 @@ .col-md-9 .votes-holder.pull-right #votes= render 'votes/votes_block', votable: @issue - .participants - %span= pluralize(@participants.count, 'participant') - - @participants.each do |participant| - = link_to_member(@project, participant, name: false, size: 24) + = render "shared/issuable/participants" .col-md-3 .input-group.cross-project-reference %span#cross-project-reference.slead.has_tooltip{title: 'Cross-project reference'} diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index ea462561668..3d7bd78dce3 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -12,7 +12,7 @@ .col-md-9 .votes-holder.pull-right #votes= render 'votes/votes_block', votable: @merge_request - = render "projects/merge_requests/show/participants" + = render "shared/issuable/participants" .col-md-3 .input-group.cross-project-reference %span#cross-project-reference.slead.has_tooltip{title: 'Cross-project reference'} @@ -21,7 +21,7 @@ .row %section.col-md-9 - = render "projects/notes/notes_with_form" + .voting_notes#notes= render "projects/notes/notes_with_form" %aside.col-md-3 .issuable-affix .context diff --git a/app/views/projects/merge_requests/show/_participants.html.haml b/app/views/shared/issuable/_participants.html.haml index c67afe963e7..b4e0def48b6 100644 --- a/app/views/projects/merge_requests/show/_participants.html.haml +++ b/app/views/shared/issuable/_participants.html.haml @@ -1,4 +1,5 @@ .participants - %span #{@participants.count} participants + %span + = pluralize @participants.count, "participant" - @participants.each do |participant| = link_to_member(@project, participant, name: false, size: 24) |