Persist Merge Request diff. Auto merge request close on push
This commit is contained in:
parent
27e3699814
commit
5a3f23f395
10 changed files with 121 additions and 28 deletions
|
@ -2,7 +2,9 @@
|
|||
.ui-box
|
||||
%h5 Commits
|
||||
.merge-request-commits
|
||||
%ul.unstyled= render @commits
|
||||
%ul.unstyled
|
||||
- @commits.each do |commit|
|
||||
= render "commits/commit", :commit => commit
|
||||
|
||||
- else
|
||||
%h5
|
||||
|
|
|
@ -11,12 +11,10 @@
|
|||
|
||||
%span.right
|
||||
- if can?(current_user, :modify_merge_request, @merge_request)
|
||||
- if @merge_request.closed
|
||||
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
|
||||
- else
|
||||
- if @merge_request.open?
|
||||
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
|
||||
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
|
||||
Edit
|
||||
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
|
||||
Edit
|
||||
|
||||
- if @merge_request.upvotes > 0
|
||||
= link_to "#notes", :class => "btn success" do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue