Skip to content

Commit 0037cf6

Browse files
committed
Merge branch 'bpj-small-pipeline-ui-changes' into 'master'
Make small pipeline schedules UI enhancements. Closes #32565 See merge request !12136
2 parents a169525 + 52dd35a commit 0037cf6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/assets/stylesheets/pages/pipeline_schedules.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.interval-pattern-form-group {
1313
label {
1414
margin-right: 10px;
15-
font-size: 12px;
15+
font-weight: normal;
1616

1717
&[for='custom'] {
1818
margin-right: 0;

app/views/projects/pipeline_schedules/_form.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
.form-group
2121
.col-md-9
2222
= f.label :ref, _('Target Branch'), class: 'label-light'
23-
= 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 } } )
23+
= 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 } } )
2424
= f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true
2525
.form-group
2626
.col-md-9

spec/features/projects/pipeline_schedules_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
end
128128

129129
it 'shows the pipeline schedule with default ref' do
130-
page.within('.git-revision-dropdown-toggle') do
130+
page.within('.js-target-branch-dropdown') do
131131
expect(first('.dropdown-toggle-text').text).to eq('master')
132132
end
133133
end

0 commit comments

Comments
 (0)