show.html.haml 4.2 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2 3
%h3
  = "Merge Request ##{@merge_request.id}:"
   
4
  %span.pretty_label.branch= @merge_request.source_branch
D
Dmitriy Zaporozhets 已提交
5
  →
6
  %span.pretty_label.branch= @merge_request.target_branch
D
Dmitriy Zaporozhets 已提交
7 8

  %span.right
9
    - if can?(current_user, :modify_merge_request, @merge_request)
10
      - if @merge_request.open?
11 12
        = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
        = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do 
13
          Edit
D
Dmitriy Zaporozhets 已提交
14

15
    %br
16
    - if @merge_request.upvotes > 0
17
      .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
18

19
= render "merge_requests/how_to_merge"
20 21 22
.back_link
  = link_to project_merge_requests_path(@project) do 
    ← To merge requests
D
Dmitriy Zaporozhets 已提交
23

24 25
.main_box
  .top_box_content
26 27
    %h5
      - if @merge_request.closed
28
        .alert-message.error.status_info Closed
29
      - else 
30
        .alert-message.success.status_info Open
31
      = @merge_request.title
32

33
  .middle_box_content
34
    %div
35
      %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by 
36 37 38 39 40 41
      = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
      %strong.author= link_to_merge_request_author(@merge_request)

      %cite.cgray and currently assigned to 
      = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
      %strong.author= link_to_merge_request_assignee(@merge_request)
42 43 44


  - if @merge_request.closed
45 46 47 48 49 50 51 52 53
    .bottom_box_content
      - if @merge_request.merged?
        %span
          Merged by #{@merge_request.merge_event.author_name} 
          %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
      - elsif @merge_request.closed_event
        %span
          Closed by #{@merge_request.closed_event.author_name} 
          %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
D
Dmitriy Zaporozhets 已提交
54

D
Dmitriy Zaporozhets 已提交
55 56

- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
V
Valery Sizov 已提交
57
  .automerge_widget.can_be_merged{:style => "display:none"}
58
    .ui-box.padded
59
      %p 
60 61 62
        You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
      = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
       
V
Valery Sizov 已提交
63 64
      
  .automerge_widget.cannot_be_merged{:style => "display:none"}
65 66 67 68
    .alert-message
      %p
        %strong This request cant be merged with GitLab. You should do it manually  
        = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
V
Valery Sizov 已提交
69 70 71 72 73
  
  .automerge_widget.unchecked
    .alert-message
      %p
        %strong Checking for ability to automatically merge… 
74 75 76 77 78
  
  .automerge_widget.already_cannot_be_merged{:style => "display:none"}
    .alert-message
      %p
        %strong This merge request already can not be merged
V
Valery Sizov 已提交
79 80


81 82


83
= render "merge_requests/commits"
D
Dmitriy Zaporozhets 已提交
84

85 86 87 88 89 90 91 92
- unless @commits.empty?
  .tabs
    %li.active
      = link_to "#notes", :class => "merge-notes-tab tab" do 
        Notes
    %li
      = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
        Diff
93

D
Dmitriy Zaporozhets 已提交
94

95
.merge_request_notes#notes= render "notes/notes", :tid => @merge_request.id, :tt => "merge_request"
D
Dmitriy Zaporozhets 已提交
96 97

.merge-request-diffs
98
.status
99 100 101

:javascript
  $(function(){
V
Valery Sizov 已提交
102 103 104
    MergeRequest.init({
      url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
    });
105 106 107 108

    $(".accept_merge_request").live("ajax:beforeSend", function() {
      $(this).replaceWith('#{image_tag "ajax_loader.gif"}');
    })
109
  })
110 111

= render "notes/per_line_form"
112

113 114 115 116 117 118 119 120 121 122
:javascript
  $(document).ready(function(){
    $(".line_note_link, .line_note_reply_link").live("click", function(e) { 
      var form = $(".per_line_form");
      $(this).parent().parent().after(form);
      form.find("#note_line_code").val($(this).attr("line_code"));
      form.show();  
      return false;
    });
  });