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

%li{ class: mr_css_classes(merge_request) }
  .merge-request-title
    = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
    - if merge_request.merged?
      %small.pull-right
        %i.fa.fa-check
        MERGED
    - else
      %span.pull-right.hidden-xs
        - if merge_request.for_fork?
          %span.light
            #{merge_request.source_project_namespace}:
        = truncate merge_request.source_branch, length: 25
        %i.fa.fa-angle-right.light
        = merge_request.target_branch
  .merge-request-info
    %span.light= "##{merge_request.iid}"
    - if merge_request.assignee
      assigned to #{link_to_member(merge_request.source_project, merge_request.assignee)}
    - if merge_request.votes_count > 0
      = render 'votes/votes_inline', votable: merge_request
    - if merge_request.notes.any?
      %span
        %i.fa.fa-comments
        = merge_request.mr_and_commit_notes.count
    - if merge_request.milestone_id?
      %span
        %i.fa.fa-clock-o
        = merge_request.milestone.title
    - if merge_request.tasks?
      %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 project_merge_requests_path(merge_request.project, label_name: label.name) do
          = render_colored_label(label)
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`
Merge Request on forked projects The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8 2013-04-25 14:15:33 +00:00			`= link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`- if merge_request.merged?`
			`%small.pull-right`
Upgrade to Font Awesome v4.2 2014-10-01 22:21:29 +00:00			`%i.fa.fa-check`
Remove HAML eval for const strings. 2014-08-26 15:58:05 +00:00			`MERGED`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`- else`
UI improvements mostly for mobile screens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-12-02 09:31:57 +00:00			`%span.pull-right.hidden-xs`
Style changes from review with @randx -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150 2013-07-16 21:14:03 +00:00			`- if merge_request.for_fork?`
Fix filter context. Dont duplicate target project name for MR 2013-08-08 14:29:31 +00:00			`%span.light`
For form MR render only namespace name Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-02-15 12:36:58 +00:00			`#{merge_request.source_project_namespace}:`
truncate long branch names on MR index Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-05-07 11:43:07 +00:00			`= truncate merge_request.source_branch, length: 25`
Upgrade to Font Awesome v4.2 2014-10-01 22:21:29 +00:00			`%i.fa.fa-angle-right.light`
truncate long branch names on MR index Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-05-07 11:43:07 +00:00			`= merge_request.target_branch`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`.merge-request-info`
Show issue/mr id in the list below title Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-12-03 15:29:52 +00:00			`%span.light= "##{merge_request.iid}"`
Show assignees in the merge-requests index 2015-02-12 02:41:47 +00:00			`- if merge_request.assignee`
			`assigned to #{link_to_member(merge_request.source_project, merge_request.assignee)}`
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.notes.any?`
			`%span`
Upgrade to Font Awesome v4.2 2014-10-01 22:21:29 +00:00			`%i.fa.fa-comments`
Redesign issues, mr lists 2013-04-06 12:10:24 +00:00			`= merge_request.mr_and_commit_notes.count`
			`- if merge_request.milestone_id?`
			`%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`
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`
Remove unnecessary ago keyword Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2013-12-30 12:49:22 +00:00			`%small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}`
Implement Merge Request Labels 2014-04-15 01:12:07 +00:00
			`.merge-request-labels`
			`- merge_request.labels.each do \|label\|`
Make labels clickable Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-11 11:18:00 +00:00			`= link_to project_merge_requests_path(merge_request.project, label_name: label.name) do`
			`= render_colored_label(label)`