diff options
| author | Stefan Tatschner <stefan@sevenbyte.org> | 2015-04-21 10:28:03 +0200 |
|---|---|---|
| committer | Stefan Tatschner <stefan@sevenbyte.org> | 2015-04-24 09:36:50 +0200 |
| commit | 4beb295b89a935212ad63345424a829e54ab113f (patch) | |
| tree | db9531ceb4359c4d8940ce8159ec79eeacc5cd00 | |
| parent | dbd0fd20a97054aca804ccd1692a0052a9af0f02 (diff) | |
| download | gitlab-ce-4beb295b89a935212ad63345424a829e54ab113f.tar.gz | |
Tweak merge requests
* Include creation time
* Include author without avatar
* Move assignee to the right
* Include comments counter by default, gray it out when there are 0
comments.
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 13 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 26 |
2 files changed, 24 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 8abd4207beb..3165396a94d 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -91,11 +91,16 @@ .merge-request-info { color: #999; font-size: 13px; - - .merge-request-labels { - display: inline-block; - } } + + } + + .merge-request-labels { + display: inline-block; + } + + .merge-request-no-comments { + opacity: 0.5; } } diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 4f30d1e69f7..5d5a23b5409 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -2,6 +2,10 @@ .merge-request-title %span.str-truncated = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title" + .merge-request-labels + - merge_request.labels.each do |label| + = link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, label_name: label.name) do + = render_colored_label(label) .pull-right.light - if merge_request.merged? %span @@ -17,20 +21,26 @@ %i.fa.fa-code-fork %span= merge_request.target_branch - note_count = merge_request.mr_and_commit_notes.user.count + - if merge_request.assignee + + = link_to_member(merge_request.source_project, merge_request.assignee, name: false) - if note_count > 0 %span %i.fa.fa-comments = note_count + - else + + %span.merge-request-no-comments + %i.fa.fa-comments + = 0 + .merge-request-info - = 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 - Unassigned + = "##{merge_request.iid} opened #{time_ago_with_tooltip(merge_request.created_at, 'bottom')} by #{link_to_member(@project, merge_request.author, avatar: false)}".html_safe - if merge_request.votes_count > 0 = render 'votes/votes_inline', votable: merge_request - if merge_request.milestone_id? + %span %i.fa.fa-clock-o = merge_request.milestone.title @@ -38,11 +48,5 @@ %span.task-status = merge_request.task_status - .pull-right.hidden-xs %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')} - - .merge-request-labels - - merge_request.labels.each do |label| - = link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, label_name: label.name) do - = render_colored_label(label) |