Commit 4a5c9680 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Style accept widgets for MR


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 797596ca08bc
......@@ -4,10 +4,6 @@
*
*/
.automerge_widget {
&.can_be_merged {
background: #DFF0D8;
}
form {
margin-bottom: 0;
.clearfix {
......@@ -16,10 +12,10 @@
}
.accept-group {
}
.how_to_merge_link {
@extend .primary;
label {
margin: 5px;
margin-left: 20px;
}
}
}
......@@ -33,11 +29,6 @@
}
}
.merge-in-progress {
@extend .padded;
@extend .append-bottom-10;
}
.mr_source_commit,
.mr_target_commit {
.commit {
......
- unless @allowed_to_merge
.alert
.bs-callout
%strong You don't have permission to merge this MR
- if @show_merge_controls
......@@ -3,16 +3,17 @@
%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"
......@@ -18,9 +19,8 @@
= 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
......@@ -25,7 +25,7 @@
.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
......@@ -29,11 +29,11 @@
%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"
&nbsp;
%strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
......@@ -34,8 +34,8 @@
%span
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
&nbsp;
%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
......@@ -41,4 +41,4 @@
%strong
%i.icon-refresh
%i.icon-refresh.icon-spin
Checking for ability to automatically merge…
......@@ -43,7 +43,7 @@
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
......@@ -47,7 +47,7 @@
%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
&nbsp;
Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment