kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix project issues and merge requests pages

This commit is contained in:
Dmitriy Zaporozhets 2015-03-19 18:27:26 -07:00
parent 0ec1c8eea9
commit 479020ec6b
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/gitlab_routing_helper.rb
View File

@ -47,6 +47,5 @@ module GitlabRoutingHelper
def project_snippet_url(entity, *args)
namespace_project_snippet_url(entity.project.namespace, entity.project, entity, *args)
end
end

2
app/views/projects/issues/_issue.html.haml
View File

@ -17,7 +17,7 @@
= issue.notes.count
.issue-info
= link_to "##{issue.iid}", project_issue_path(issue.project, issue), class: "light"
= link_to "##{issue.iid}", issue_path(issue), class: "light"
- if issue.assignee
assigned to #{link_to_member(@project, issue.assignee)}
- if issue.votes_count > 0

2
app/views/projects/merge_requests/_merge_request.html.haml
View File

@ -22,7 +22,7 @@
%i.fa.fa-comments
= merge_request.mr_and_commit_notes.count
.merge-request-info
= link_to "##{merge_request.iid}", project_merge_request_path(merge_request.target_project, merge_request), class: "light"
= link_to "##{merge_request.iid}", merge_request_path(merge_request), class: "light"
- if merge_request.assignee
assigned to #{link_to_member(merge_request.source_project, merge_request.assignee)}
- else