_show.html.haml 3.93 KB
Newer Older
1
- page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
2 3
= render "header_title"

4 5 6
- if params[:view] == 'parallel'
  - fluid_layout true

7
.merge-request{'data-url' => merge_request_path(@merge_request)}
8
  = render "projects/merge_requests/show/mr_title"
9

10
  .merge-request-details.issuable-details
11 12 13 14 15 16 17 18
    = 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
19

20 21 22 23 24 25 26 27 28 29 30 31 32 33
          %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
34

35 36
    = render "projects/merge_requests/show/how_to_merge"
    = render "projects/merge_requests/widget/show.html.haml"
37

38 39 40 41 42
    - if @merge_request.open? && @merge_request.source_branch_exists? && @merge_request.can_be_merged? && @merge_request.can_be_merged_by?(current_user)
      .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"
43

44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
    - if @commits.present?
      %ul.merge-request-tabs.center-top-menu.no-top.no-bottom
        %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
            %span.badge= @merge_request.diffs.size
63

64 65 66 67
      .tab-content
        #notes.notes.tab-pane.voting_notes
          .gray-content-block.second-block.oneline-block
            = render 'votes/votes_block', votable: @merge_request
68

69 70 71 72 73 74 75
          .row
            %section.col-md-9
              .issuable-discussion
                = render "projects/merge_requests/discussion"
            %aside.col-md-3
              = render 'shared/issuable/sidebar', issuable: @merge_request
            = render 'shared/show_aside'
76

77 78 79 80 81 82
        #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
83

84 85
      .mr-loading-status
        = spinner
86

87
:javascript
88
  var merge_request;
89

90 91 92
  merge_request = new MergeRequest({
    action: "#{controller.action_name}"
  });