_show.html.haml 3.17 KB
Newer Older
1
.merge-request{'data-url' => merge_request_path(@merge_request)}
2 3 4 5 6 7 8 9 10 11 12
  .merge-request-details
    = render "projects/merge_requests/show/mr_title"
    %hr
    = render "projects/merge_requests/show/mr_box"
    %hr
    .append-bottom-20
      .slead
        %span From
        - if @merge_request.for_fork?
          %strong.label-branch<
            - if @merge_request.source_project
13
              = link_to @merge_request.source_project_namespace, namespace_project_path(@merge_request.source_project.namespace, @merge_request.source_project)
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
            - else
              \ #{@merge_request.source_project_namespace}
            \:#{@merge_request.source_branch}
          %span into
          %strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
        - else
          %strong.label-branch #{@merge_request.source_branch}
          %span into
          %strong.label-branch #{@merge_request.target_branch}
        - if @merge_request.open?
          %span.pull-right
            .btn-group
              %a.btn.dropdown-toggle{ data: {toggle: :dropdown} }
                %i.fa.fa-download
                Download as
                %span.caret
              %ul.dropdown-menu
31 32
                %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
                %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
33

34 35
    = render "projects/merge_requests/show/how_to_merge"
    = render "projects/merge_requests/show/state_widget"
36

37 38
  - if @commits.present?
    %ul.nav.nav-tabs.merge-request-tabs
39
      %li.notes-tab{data: {action: 'notes', toggle: 'tab'}}
40
        = link_to merge_request_path(@merge_request) do
41
          %i.fa.fa-comments
42
          Discussion
43
          %span.badge= @merge_request.mr_and_commit_notes.user.count
44
      %li.commits-tab{data: {action: 'commits', toggle: 'tab'}}
45
        = link_to merge_request_path(@merge_request), title: 'Commits' do
46
          %i.fa.fa-history
47 48
          Commits
          %span.badge= @commits.size
49
      %li.diffs-tab{data: {action: 'diffs', toggle: 'tab'}}
Vinnie Okada's avatar
Vinnie Okada committed
50
        = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) do
51 52 53 54
          %i.fa.fa-list-alt
          Changes
          %span.badge= @merge_request.diffs.size

55 56 57 58
  .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
    = render "projects/merge_requests/discussion"
  .commits.tab-content
    = render "projects/merge_requests/show/commits"
59 60 61
  .diffs.tab-content
    - if current_page?(action: 'diffs')
      = render "projects/merge_requests/show/diffs"
62

63 64
  .mr-loading-status
    = spinner
65

66 67

:javascript
68
  var merge_request;
69

70
  merge_request = new MergeRequest({
Vinnie Okada's avatar
Vinnie Okada committed
71
    url_to_automerge_check: "#{automerge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
72
    check_enable: #{@merge_request.unchecked? ? "true" : "false"},
Vinnie Okada's avatar
Vinnie Okada committed
73
    url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
74
    ci_enable: #{@project.ci_service ? "true" : "false"},
75 76 77
    current_status: "#{@merge_request.merge_status_name}",
    action: "#{controller.action_name}"
  });