_show.html.haml 4.27 KB
Newer Older
Phil Hughes's avatar
Phil Hughes committed
1
- page_title           "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
2 3
- page_description     @merge_request.description
- page_card_attributes @merge_request.card_attributes
4

5 6
= render "header_title"

7
- if diff_view == 'parallel'
8 9
  - fluid_layout true

10
.merge-request{'data-url' => merge_request_path(@merge_request)}
11
  = render "projects/merge_requests/show/mr_title"
12

13
  .merge-request-details.issuable-details{data: {id: @merge_request.project.id}}
14 15 16 17 18 19 20 21
    = render "projects/merge_requests/show/mr_box"
    .append-bottom-default.mr-source-target.prepend-top-default
      - if @merge_request.open?
        .pull-right
          - if @merge_request.source_branch_exists?
            = link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do
              = icon('cloud-download fw')
              Check out branch
22

23 24 25 26 27 28 29 30 31 32 33 34 35 36
          %span.dropdown
            %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
              = icon('download')
              Download as
              %span.caret
            %ul.dropdown-menu
              %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
              %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
      .normal
        %span Request to merge
        %span.label-branch= source_branch_with_namespace(@merge_request)
        %span into
        = link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
          = @merge_request.target_branch
37 38
        - if @merge_request.open? && @merge_request.diverged_from_target_branch?
          %span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind)
39

40 41
    = render "projects/merge_requests/show/how_to_merge"
    = render "projects/merge_requests/widget/show.html.haml"
42

43
    - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user)
44 45 46 47
      .light.prepend-top-default
        You can also accept this merge request manually using the
        = succeed '.' do
          = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
48

49
    - if @commits.present?
50
      %ul.merge-request-tabs.nav-links.no-top.no-bottom
51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
        %li.notes-tab
          = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
            Discussion
            %span.badge= @merge_request.mr_and_commit_notes.user.count
        %li.commits-tab
          = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
            Commits
            %span.badge= @commits.size
        - if @ci_commit
          %li.builds-tab
            = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
              Builds
              %span.badge= @statuses.size
        %li.diffs-tab
          = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
            Changes
67
            %span.badge= @merge_request.diff_size
68

69 70
      .tab-content
        #notes.notes.tab-pane.voting_notes
Phil Hughes's avatar
Phil Hughes committed
71
          .content-block.content-block-small.oneline-block
72
            = render 'votes/votes_block', votable: @merge_request
73

74
          .row
75
            %section.col-md-12
76 77
              .issuable-discussion
                = render "projects/merge_requests/discussion"
78

79 80 81 82 83 84
        #commits.commits.tab-pane
          - # This tab is always loaded via AJAX
        #builds.builds.tab-pane
          - # This tab is always loaded via AJAX
        #diffs.diffs.tab-pane
          - # This tab is always loaded via AJAX
85

86 87
      .mr-loading-status
        = spinner
88

89
= render 'shared/issuable/sidebar', issuable: @merge_request
90
- if @merge_request.can_be_reverted?
91
  = render "projects/commit/revert", commit: @merge_request.merge_commit, title: @merge_request.title
92

93
:javascript
94
  var merge_request;
95

96 97 98
  merge_request = new MergeRequest({
    action: "#{controller.action_name}"
  });