_new_submit.html.haml 2.1 KB
Newer Older
1 2 3 4
%h3.page-title
  New merge request
%p.slead
  From
5 6 7
  %strong.label-branch #{@merge_request.source_project_namespace}:#{@merge_request.source_branch}
  %span into
  %strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
8 9

  %span.pull-right
10
    = link_to 'Change branches', mr_change_branches_path(@merge_request)
11
%hr
12
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form' } do |f|
13
  .merge-request-form-info
14 15 16 17 18
    = render 'projects/issuable_form', f: f, issuable: @merge_request
    = f.hidden_field :source_project_id
    = f.hidden_field :source_branch
    = f.hidden_field :target_project_id
    = f.hidden_field :target_branch
19

20 21
.mr-compare.merge-request
  %ul.nav.nav-tabs.merge-request-tabs
22
    %li.commits-tab{data: {action: 'commits', toggle: 'tab'}}
23 24 25 26
      = link_to url_for(params) do
        %i.fa.fa-history
        Commits
        %span.badge= @commits.size
27
    %li.diffs-tab{data: {action: 'diffs', toggle: 'tab'}}
28 29 30 31
      = link_to url_for(params) do
        %i.fa.fa-list-alt
        Changes
        %span.badge= @diffs.size
32

33
  .commits.tab-content
34
    = render "projects/commits/commits", project: @project
35 36 37 38
  .diffs.tab-content
    - if @diffs.present?
      = render "projects/diffs/diffs", diffs: @diffs, project: @project
    - elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
39
      .alert.alert-danger
40 41 42
        %h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
        %p To preserve performance the line changes are not shown.
    - else
43
      .alert.alert-danger
44 45
        %h4 This comparison includes a huge diff.
        %p To preserve performance the line changes are not shown.
46 47 48 49 50 51

:javascript
  $('.assign-to-me-link').on('click', function(e){
    $('#merge_request_assignee_id').val("#{current_user.id}").trigger("change");
    e.preventDefault();
  });
52

53
  window.project_uploads_path = "#{namespace_project_uploads_path @project.namespace, @project}";
54 55 56 57 58 59

:javascript
  var merge_request
  merge_request = new MergeRequest({
    action: 'commits'
  });
60