diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 17:37:06 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 17:37:06 +0100 |
| commit | f10bd7df90cd509848dfcc9a574d7e4569a0428e (patch) | |
| tree | fd546d3777476015726c6453a0c79cf5e911f535 | |
| parent | 9517b6211782619ba4d4f9f1322230bd833c0a2c (diff) | |
| download | gitlab-ce-f10bd7df90cd509848dfcc9a574d7e4569a0428e.tar.gz | |
Tweak merge request list item
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 60dd4f4f87c..1d4c9b66c42 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -33,7 +33,12 @@ \##{merge_request.iid} · opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} 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 = icon('clock-o') @@ -42,11 +47,6 @@ - merge_request.labels.each do |label| = 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? %span.task-status |