diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-12 13:30:19 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-13 11:08:32 +0100 |
| commit | 0a2c334cd558dc4f6e822bac1077f480e9fffc7c (patch) | |
| tree | 5c3bed1a3483fc1a79a99e2cf727e20d511e71f3 | |
| parent | 06440b12d839c34ab4bf1dffdd0d4f5277901f8a (diff) | |
| download | gitlab-ce-0a2c334cd558dc4f6e822bac1077f480e9fffc7c.tar.gz | |
Restore some unrelated changes from d9cb907c
| -rw-r--r-- | app/views/search/results/_issue.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/results/_merge_request.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/results/_milestone.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml index 796782035f2..1f055cdfa31 100644 --- a/app/views/search/results/_issue.html.haml +++ b/app/views/search/results/_issue.html.haml @@ -1,7 +1,7 @@ .search-result-row %h4 = confidential_icon(issue) - = link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do + = link_to namespace_project_issue_path(issue.project.namespace.becomes(Namespace), issue.project, issue) do %span.term.str-truncated= issue.title - if issue.closed? %span.badge.badge-danger.prepend-left-5= _("Closed") diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index f0e0af11f27..074bb9bce8d 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -1,6 +1,6 @@ .search-result-row %h4 - = link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do + = link_to namespace_project_merge_request_path(merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request) do %span.term.str-truncated= merge_request.title - if merge_request.merged? %span.badge.badge-primary.prepend-left-5= _("Merged") diff --git a/app/views/search/results/_milestone.html.haml b/app/views/search/results/_milestone.html.haml index 2daa96e34d1..3201f1a7815 100644 --- a/app/views/search/results/_milestone.html.haml +++ b/app/views/search/results/_milestone.html.haml @@ -1,6 +1,6 @@ .search-result-row %h4 - = link_to [milestone.project.namespace.becomes(Namespace), milestone.project, milestone] do + = link_to namespace_project_milestone_path(milestone.project.namespace.becomes(Namespace), milestone.project, milestone) do %span.term.str-truncated= milestone.title - if milestone.description.present? |