-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
- Loading branch information
1 parent
b62d4f6
commit d187ffe
Showing
2 changed files
with
31 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 27 additions & 27 deletions
54
app/views/projects/merge_requests/show/_mr_accept.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,53 @@ | ||
- unless @allowed_to_merge | ||
.alert | ||
.bs-callout | ||
%strong You don't have permission to merge this MR | ||
|
||
|
||
- if @show_merge_controls | ||
.automerge_widget.can_be_merged{style: "display:none"} | ||
.alert.alert-success | ||
%span | ||
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f| | ||
%p | ||
You can accept this request automatically. | ||
If you still want to do it manually - | ||
%strong | ||
= link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" | ||
for instructions | ||
.accept-group | ||
.automerge_widget.can_be_merged.hide | ||
.bs-callout.bs-callout-success.clearfix | ||
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f| | ||
%h4 | ||
You can accept this request automatically. | ||
%p | ||
If you still want to do it manually - | ||
%strong | ||
= link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" | ||
for instructions | ||
.accept-group | ||
.pull-left | ||
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" | ||
- unless @merge_request.disallow_source_branch_removal? | ||
.remove_branch_holder | ||
= label_tag :should_remove_source_branch, class: "checkbox" do | ||
= check_box_tag :should_remove_source_branch | ||
Remove source-branch | ||
.clearfix | ||
- unless @merge_request.disallow_source_branch_removal? | ||
.remove_branch_holder.pull-left | ||
= label_tag :should_remove_source_branch, class: "checkbox" do | ||
= check_box_tag :should_remove_source_branch | ||
Remove source-branch | ||
|
||
|
||
.automerge_widget.no_satellite{style: "display:none"} | ||
.alert.alert-danger | ||
.automerge_widget.no_satellite.hide | ||
.bs-callout.bs-callout-danger | ||
%span | ||
%strong This repository does not have satellite. Ask an administrator to fix this issue | ||
|
||
.automerge_widget.cannot_be_merged{style: "display:none"} | ||
.alert.alert-disabled | ||
.automerge_widget.cannot_be_merged.hide | ||
.bs-callout.bs-callout-disabled | ||
%span | ||
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal" | ||
| ||
%strong This request can't be merged with GitLab. You should do it manually | ||
|
||
.automerge_widget.unchecked | ||
.alert.alert-warning | ||
.bs-callout.bs-callout-warning | ||
%strong | ||
%i.icon-refresh | ||
%i.icon-refresh.icon-spin | ||
Checking for ability to automatically merge… | ||
|
||
.automerge_widget.already_cannot_be_merged{style: "display:none"} | ||
.alert.alert-info | ||
.automerge_widget.already_cannot_be_merged.hide | ||
.bs-callout.bs-callout-info | ||
%strong This merge request already can not be merged. Try to reload page. | ||
|
||
.merge-in-progress.hide | ||
%span.cgray | ||
.bs-callout.bs-callout-success | ||
%i.icon-refresh.icon-spin | ||
| ||
Merge is in progress. Please wait. Page will be automatically reloaded. |