Commit 0037cf63 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'bpj-small-pipeline-ui-changes' into 'master'

Make small pipeline schedules UI enhancements.

Closes #32565

See merge request !12136
parents a1695253 52dd35af
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.interval-pattern-form-group { .interval-pattern-form-group {
label { label {
margin-right: 10px; margin-right: 10px;
font-size: 12px; font-weight: normal;
&[for='custom'] { &[for='custom'] {
margin-right: 0; margin-right: 0;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.form-group .form-group
.col-md-9 .col-md-9
= f.label :ref, _('Target Branch'), class: 'label-light' = f.label :ref, _('Target Branch'), class: 'label-light'
= dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown git-revision-dropdown-toggle', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: _("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', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: _("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 .form-group
.col-md-9 .col-md-9
......
...@@ -127,7 +127,7 @@ feature 'Pipeline Schedules', :feature do ...@@ -127,7 +127,7 @@ feature 'Pipeline Schedules', :feature do
end end
it 'shows the pipeline schedule with default ref' do it 'shows the pipeline schedule with default ref' do
page.within('.git-revision-dropdown-toggle') do page.within('.js-target-branch-dropdown') do
expect(first('.dropdown-toggle-text').text).to eq('master') expect(first('.dropdown-toggle-text').text).to eq('master')
end end
end end
......
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