gitlab-org--gitlab-foss/app/views/projects/merge_requests/_merge_request.html.haml

- ci_commit = merge_request.ci_commit
%li{ class: mr_css_classes(merge_request) }
  .merge-request-title
    %span.merge-request-title-text
      = 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_label(label, project: merge_request.project)
    .pull-right.light
      - if ci_commit
        = render_ci_status(ci_commit)
      - if merge_request.merged?
        %span
          %i.fa.fa-check
          MERGED
      - elsif merge_request.closed?
        %span
          %i.fa.fa-ban
          CLOSED
      - note_count = merge_request.mr_and_commit_notes.user.count
      - if merge_request.assignee
        &nbsp;
        = link_to_member(merge_request.source_project, merge_request.assignee, name: false)
      - if note_count > 0
        &nbsp;
        %span
          %i.fa.fa-comments
          = note_count
      - else
        &nbsp;
        %span.merge-request-no-comments
          %i.fa.fa-comments
          = 0

  .merge-request-info
    = "##{merge_request.iid} opened #{time_ago_with_tooltip(merge_request.created_at, placement: '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?
      &nbsp;
      %span
        %i.fa.fa-clock-o
        = merge_request.milestone.title
    - if merge_request.target_project.default_branch != merge_request.target_branch
      &nbsp;
      %span
        %i.fa.fa-code-fork
        = merge_request.target_branch
    - if merge_request.tasks?
      %span.task-status
        = merge_request.task_status

    .pull-right.hidden-xs
      %span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}
Render CI status on merge requests index page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-10-23 15:01:10 +00:00			`- ci_commit = merge_request.ci_commit`
Refactor css lists. Use well-list class 2012-12-18 03:14:05 +00:00			`%li{ class: mr_css_classes(merge_request) }`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`.merge-request-title`
Dont truncate issue/mr title Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-06-08 14:33:33 +00:00			`%span.merge-request-title-text`
More use of shortcut routes 2015-02-26 03:50:01 +00:00			`= link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"`
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. 2015-04-21 08:28:03 +00:00			`.merge-request-labels`
			`- merge_request.labels.each do \|label\|`
Add link_to_label helper 2015-05-22 03:40:25 +00:00			`= link_to_label(label, project: merge_request.project)`
Minor css improvements * lighter color for comments count * better UI for issue assigee.milestone block 2015-02-20 08:11:25 +00:00			`.pull-right.light`
Render CI status on merge requests index page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-10-23 15:01:10 +00:00			`- if ci_commit`
Move rendering CI status to helper Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-10-23 15:32:52 +00:00			`= render_ci_status(ci_commit)`
Improve issue and merge request lists UI 2015-02-20 05:55:47 +00:00			`- if merge_request.merged?`
			`%span`
			`%i.fa.fa-check`
Revert merge request states renaming Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-06-18 17:15:17 +00:00			`MERGED`
Improve issue and merge request lists UI 2015-02-20 05:55:47 +00:00			`- elsif merge_request.closed?`
			`%span`
Consistently refer to MRs as either Accepted or Rejected. 2015-05-25 15:00:27 +00:00			`%i.fa.fa-ban`
Revert merge request states renaming Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-06-18 17:15:17 +00:00			`CLOSED`
Don't include system notes in issue/MR comment count. 2015-03-23 15:43:08 +00:00			`- note_count = merge_request.mr_and_commit_notes.user.count`
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. 2015-04-21 08:28:03 +00:00			`- if merge_request.assignee`
			` `
			`= link_to_member(merge_request.source_project, merge_request.assignee, name: false)`
Don't include system notes in issue/MR comment count. 2015-03-23 15:43:08 +00:00			`- if note_count > 0`
Improve issue and merge request lists UI 2015-02-20 05:55:47 +00:00			` `
			`%span`
			`%i.fa.fa-comments`
Don't include system notes in issue/MR comment count. 2015-03-23 15:43:08 +00:00			`= note_count`
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. 2015-04-21 08:28:03 +00:00			`- else`
			` `
			`%span.merge-request-no-comments`
			`%i.fa.fa-comments`
			`= 0`

Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`.merge-request-info`
Update time_ago_with_tooltip helper Minor refactoring, add specs, changes arguments to use keywords. 2015-06-17 18:04:14 +00:00			`= "##{merge_request.iid} opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} by #{link_to_member(@project, merge_request.author, avatar: false)}".html_safe`
Show votes as a bar 2012-09-08 14:44:56 +00:00			`- if merge_request.votes_count > 0`
Extract displaying votes into partials 2012-09-10 13:27:14 +00:00			`= render 'votes/votes_inline', votable: merge_request`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`- if merge_request.milestone_id?`
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. 2015-04-21 08:28:03 +00:00			` `
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`%span`
Upgrade to Font Awesome v4.2 2014-10-01 22:21:29 +00:00			`%i.fa.fa-clock-o`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`= merge_request.milestone.title`
Display target branch on MR list when it is different from project's default 2015-11-03 14:44:14 +00:00			`- if merge_request.target_project.default_branch != merge_request.target_branch`
			` `
			`%span`
			`%i.fa.fa-code-fork`
			`= merge_request.target_branch`
Add task lists to issues and merge requests Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a list item and turn it into a checkbox input. Users who can modify the issue or MR can toggle the checkboxes directly or edit the Markdown to manage the tasks. Task status is also displayed in the MR and issue lists. 2014-10-05 05:53:44 +00:00			`- if merge_request.tasks?`
			`%span.task-status`
			`= merge_request.task_status`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00
UI improvements mostly for mobile screens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-12-02 09:31:57 +00:00			`.pull-right.hidden-xs`
Improve font size on issues/mr list Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-09-08 07:32:06 +00:00			`%span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}`