From cd05782bc589421ff744c057117283da8c956ce5 Mon Sep 17 00:00:00 2001 From: Andrew Widdersheim Date: Tue, 10 Feb 2015 11:23:48 -0500 Subject: [PATCH 1/2] Fix small grammar issue on projects show page --- app/views/projects/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 737a34decde..2df54736451 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -59,7 +59,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 From 3d87cf8dc18eb8a37fc6996939c52a1ce508126d Mon Sep 17 00:00:00 2001 From: yglukhov Date: Tue, 27 Jan 2015 14:58:31 +0200 Subject: [PATCH 2/2] Make MR and issue numbers clickable links in MR and issue lists. --- app/views/projects/issues/_issue.html.haml | 2 +- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index dc6510be858..9ccda38ade9 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -11,7 +11,7 @@ CLOSED .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 diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 5afc87fb6b1..4e294064cb6 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -14,7 +14,7 @@ %i.fa.fa-angle-right.light = merge_request.target_branch .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