Merge branch '47522-revert-mr-modal' into 'master'
Resolve "Revert MR modal box is too smal after BS4" Closes #47522 See merge request gitlab-org/gitlab-ce!19603
This commit is contained in:
commit
454a6a02ef
2 changed files with 11 additions and 11 deletions
|
@ -20,18 +20,18 @@
|
|||
%span{ "aria-hidden": true } ×
|
||||
.modal-body
|
||||
- if description
|
||||
%p.append-bottom-20= description
|
||||
%p= description
|
||||
= form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do
|
||||
.form-group.row.branch
|
||||
= label_tag 'start_branch', branch_label, class: 'col-form-label col-sm-2'
|
||||
.col-sm-10
|
||||
= hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
|
||||
= dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } })
|
||||
.form-group.branch
|
||||
= label_tag 'start_branch', branch_label, class: 'label-light'
|
||||
|
||||
- if can?(current_user, :push_code, @project)
|
||||
= render 'shared/new_merge_request_checkbox'
|
||||
- else
|
||||
= hidden_field_tag 'create_merge_request', 1, id: nil
|
||||
= hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
|
||||
= dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } })
|
||||
|
||||
- if can?(current_user, :push_code, @project)
|
||||
= render 'shared/new_merge_request_checkbox'
|
||||
- else
|
||||
= hidden_field_tag 'create_merge_request', 1, id: nil
|
||||
.form-actions
|
||||
= submit_tag label, class: 'btn btn-create'
|
||||
= link_to _("Cancel"), '#', class: "btn btn-cancel", "data-dismiss" => "modal"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.form-check
|
||||
.form-check.prepend-top-8
|
||||
- nonce = SecureRandom.hex
|
||||
= check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request form-check-input', id: "create_merge_request-#{nonce}"
|
||||
= label_tag "create_merge_request-#{nonce}", class: 'form-check-label' do
|
||||
|
|
Loading…
Reference in a new issue