home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Replace can be merged with can be accepted

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-06-12 14:25:20 +00:00
parent 07703c22b3
commit a4ab6ffd33
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/widget/open/_approve.html.haml
+8 -9
View File
@@ -1,9 +1,8 @@
%div
%h4
Requires #{pluralize(@merge_request.approvals_left, 'approval')}
%p Each merge request in this project must be approved by #{pluralize(@merge_request.approvals_required, 'user')} before it can be merged
- unless @merge_request.approved_by?(current_user)
.append-bottom-10
= form_for [:approve, @project.namespace.becomes(Namespace), @project, @merge_request], method: :post do |f|
= f.submit "Approve Merge Request", class: "btn btn-primary approve-btn"
%div
%h4
Requires #{pluralize(@merge_request.approvals_left, 'approval')}
%p Each merge request in this project must be approved by #{pluralize(@merge_request.approvals_required, 'user')} before it can be accepted
- unless @merge_request.approved_by?(current_user)
.append-bottom-10
= form_for [:approve, @project.namespace.becomes(Namespace), @project, @merge_request], method: :post do |f|
= f.submit "Approve Merge Request", class: "btn btn-primary approve-btn"