Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
ad2720aea8
3 changed files with 3 additions and 3 deletions
|
@ -17,7 +17,7 @@
|
|||
= issue.notes.count
|
||||
|
||||
.issue-info
|
||||
%span.light= "##{issue.iid}"
|
||||
= link_to "##{issue.iid}", project_issue_path(issue.project, issue), class: "light"
|
||||
- if issue.assignee
|
||||
assigned to #{link_to_member(@project, issue.assignee)}
|
||||
- if issue.votes_count > 0
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
%i.fa.fa-comments
|
||||
= merge_request.mr_and_commit_notes.count
|
||||
.merge-request-info
|
||||
%span.light= "##{merge_request.iid}"
|
||||
= link_to "##{merge_request.iid}", project_merge_request_path(merge_request.target_project, merge_request), class: "light"
|
||||
- if merge_request.assignee
|
||||
assigned to #{link_to_member(merge_request.source_project, merge_request.assignee)}
|
||||
- else
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
%span.light Created on
|
||||
#{@project.created_at.stamp('Aug 22, 2013')}
|
||||
%p
|
||||
%span.light Owned by
|
||||
%span.light Owned by #{@project.group ? "the" : nil}
|
||||
- if @project.group
|
||||
#{link_to @project.group.name, @project.group} group
|
||||
- else
|
||||
|
|
Loading…
Reference in a new issue