kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Make small pipeline schedules UI enhancements.

Closes #32565

See merge request !12136
This commit is contained in:
Annabel Dunstone Gray 2017-06-13 20:16:13 +00:00
parent a169525321 52dd35afb9
commit 0037cf634d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/pages/pipeline_schedules.scss
View File

@ -12,7 +12,7 @@
.interval-pattern-form-group {
label {
margin-right: 10px;
font-size: 12px;
font-weight: normal;
&[for='custom'] {
margin-right: 0;

2
app/views/projects/pipeline_schedules/_form.html.haml
View File

@ -20,7 +20,7 @@
.form-group
.col-md-9
= 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
.form-group
.col-md-9

2
spec/features/projects/pipeline_schedules_spec.rb
View File

@ -127,7 +127,7 @@ feature 'Pipeline Schedules', :feature do
end
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')
end
end