Commit 5b8bddfe authored by Phil Hughes's avatar Phil Hughes

Merge branch '59921-pipeline-schedule' into 'master'

Replaces CSS with BS4 utility class

Closes #59921

See merge request gitlab-org/gitlab-ce!27309
parents 6e3e2cb0 73e6db84
.js-pipeline-schedule-form { .pipeline-schedule-form {
.dropdown-select,
.dropdown-menu-toggle {
width: 100% !important;
}
.gl-field-error { .gl-field-error {
margin: 10px 0 0; margin: 10px 0 0;
} }
......
= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "js-pipeline-schedule-form" } do |f| = form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "js-pipeline-schedule-form pipeline-schedule-form" } do |f|
= form_errors(@schedule) = form_errors(@schedule)
.form-group.row .form-group.row
.col-md-9 .col-md-9
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :cron_timezone, _('Cron Timezone'), class: 'label-bold' = f.label :cron_timezone, _('Cron Timezone'), class: 'label-bold'
= dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown w-100', dropdown_class: 'w-100', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
= f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true = f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true
.form-group.row .form-group.row
.col-md-9 .col-md-9
= f.label :ref, _('Target Branch'), class: 'label-bold' = f.label :ref, _('Target Branch'), class: 'label-bold'
= dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } ) = dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown w-100', dropdown_class: 'git-revision-dropdown w-100', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } )
= f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true = f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true
.form-group.row.js-ci-variable-list-section .form-group.row.js-ci-variable-list-section
.col-md-9 .col-md-9
......
---
title: Replaces CSS with BS4 utility class for pipeline schedules
merge_request:
author:
type: other
Markdown is supported
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