Tweak merge request list item
This commit is contained in:
parent
9517b62117
commit
f10bd7df90
|
@ -33,7 +33,12 @@
|
||||||
\##{merge_request.iid} ·
|
\##{merge_request.iid} ·
|
||||||
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
|
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
|
||||||
by #{link_to_member(@project, merge_request.author, avatar: false)}
|
by #{link_to_member(@project, merge_request.author, avatar: false)}
|
||||||
- if merge_request.milestone_id?
|
- if merge_request.target_project.default_branch != merge_request.target_branch
|
||||||
|
|
||||||
|
= link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do
|
||||||
|
= icon('code-fork')
|
||||||
|
= merge_request.target_branch
|
||||||
|
- if merge_request.milestone
|
||||||
|
|
||||||
= link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, milestone_title: merge_request.milestone.title) do
|
= link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, milestone_title: merge_request.milestone.title) do
|
||||||
= icon('clock-o')
|
= icon('clock-o')
|
||||||
|
@ -42,11 +47,6 @@
|
||||||
|
|
||||||
- merge_request.labels.each do |label|
|
- merge_request.labels.each do |label|
|
||||||
= link_to_label(label, project: merge_request.project)
|
= link_to_label(label, project: merge_request.project)
|
||||||
- if merge_request.target_project.default_branch != merge_request.target_branch
|
|
||||||
|
|
||||||
= link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do
|
|
||||||
= icon('code-fork')
|
|
||||||
= merge_request.target_branch
|
|
||||||
- if merge_request.tasks?
|
- if merge_request.tasks?
|
||||||
|
|
||||||
%span.task-status
|
%span.task-status
|
||||||
|
|
Loading…
Reference in New Issue