_show.html.haml 6.59 KB
Newer Older
1
- @content_class = "limit-container-width" unless fluid_layout
2
- page_title           "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
3 4
- page_description     @merge_request.description
- page_card_attributes @merge_request.card_attributes
Phil Hughes's avatar
Phil Hughes committed
5
- content_for :page_specific_javascripts do
6
  = page_specific_javascript_bundle_tag('common_vue')
7
  = page_specific_javascript_bundle_tag('diff_notes')
8

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

12
  .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
13 14 15 16 17
    = 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?
18
            - if koding_enabled? && @repository.koding_yml
19
              = link_to koding_project_url(@merge_request.source_project, @merge_request.source_branch, @merge_request.commits.first.short_id), class: "btn inline btn-grouped btn-sm", target: '_blank', rel: 'noopener noreferrer' do
20
                Run in IDE (Koding)
21
            = link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do
22
              Check out branch
23

24
          %span.dropdown.inline.prepend-left-5
25 26
            %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
              Download as
27
              = icon('caret-down')
28
            %ul.dropdown-menu.dropdown-menu-align-right
29 30
              %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
              %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
31
      .normal
32
        %span <b>Request to merge</b>
33
        %span.label-branch= source_branch_with_namespace(@merge_request)
34
        %span <b>into</b>
35
        %span.label-branch
36
          = link_to_if @merge_request.target_branch_exists?, @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @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 42
    - if @merge_request.source_branch_exists?
      = render "projects/merge_requests/show/how_to_merge"

43
    = render "projects/merge_requests/widget/show.html.haml"
44

45
    - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user)
46
      .merge-manually.light.prepend-top-default
47 48 49
        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"
50

51
    .content-block.content-block-small.emoji-list-container
52 53
      = render 'award_emoji/awards_block', awardable: @merge_request, inline: true

54
    .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
55 56 57 58
      .merge-request-tabs-container.scrolling-tabs-container.inner-page-scroll-tabs
        .fade-left= icon('angle-left')
        .fade-right= icon('angle-right')
        %ul.merge-request-tabs.nav-links.scrolling-tabs
59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
          %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.related_notes.user.count
          - if @merge_request.source_project
            %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_count
          - if @pipelines.any?
            %li.pipelines-tab
              = link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#pipelines', action: 'pipelines', toggle: 'tab' } do
                Pipelines
                %span.badge= @pipelines.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.diff_size
          %li#resolve-count-app.line-resolve-all-container.pull-right.prepend-top-10.hidden-xs{ "v-cloak" => true }
            %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}" }
              %div
                .line-resolve-all{ "v-show" => "discussionCount > 0",
                  ":class" => "{ 'has-next-btn': !loggedOut && resolvedDiscussionCount !== discussionCount }" }
                  %span.line-resolve-btn.is-disabled{ type: "button",
                      ":class" => "{ 'is-active': resolvedDiscussionCount === discussionCount }" }
                    = render "shared/icons/icon_status_success.svg"
                  %span.line-resolve-text
                    {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
87
                = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request
88
                = render "discussions/jump_to_next"
89

90 91 92 93 94 95
    .tab-content#diff-notes-app
      #notes.notes.tab-pane.voting_notes
        .row
          %section.col-md-12
            .issuable-discussion
              = render "projects/merge_requests/discussion"
96

97
      #commits.commits.tab-pane
98
        -# This tab is always loaded via AJAX
99
      #pipelines.pipelines.tab-pane
100
        - if @pipelines.any?
101
          = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
102
      #diffs.diffs.tab-pane
103
        -# This tab is always loaded via AJAX
104

105 106
    .mr-loading-status
      = spinner
107

108
= render 'shared/issuable/sidebar', issuable: @merge_request
109
- if @merge_request.can_be_reverted?(current_user)
110
  = render "projects/commit/change", type: 'revert', commit: @merge_request.merge_commit, title: @merge_request.title
111
- if @merge_request.can_be_cherry_picked?
112
  = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title
113

114
:javascript
Bryce Johnson's avatar
Bryce Johnson committed
115 116 117 118
  $(function () {
    new MergeRequest({
      action: "#{controller.action_name}"
    });
119
  });
120

Jarka Kadlecova's avatar
Jarka Kadlecova committed
121
  var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}";