diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-13 20:16:13 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-13 20:16:13 +0000 |
| commit | 0037cf634dbcc8045fba9cbc28133cfde07dc97c (patch) | |
| tree | 2b29180505c75b9741c79dfe041658372ba4ee76 | |
| parent | a1695253215534539ea17794a8696212c5454b82 (diff) | |
| parent | 52dd35afb98d6efce233210e5ec2c8c924c55608 (diff) | |
| download | gitlab-ce-0037cf634dbcc8045fba9cbc28133cfde07dc97c.tar.gz | |
Merge branch 'bpj-small-pipeline-ui-changes' into 'master'
Make small pipeline schedules UI enhancements.
Closes #32565
See merge request !12136
| -rw-r--r-- | app/assets/stylesheets/pages/pipeline_schedules.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/pipeline_schedules/_form.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/pipeline_schedules.scss b/app/assets/stylesheets/pages/pipeline_schedules.scss index ab417948931..595eb40fec7 100644 --- a/app/assets/stylesheets/pages/pipeline_schedules.scss +++ b/app/assets/stylesheets/pages/pipeline_schedules.scss @@ -12,7 +12,7 @@ .interval-pattern-form-group { label { margin-right: 10px; - font-size: 12px; + font-weight: normal; &[for='custom'] { margin-right: 0; diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml index 25ae4e0e18f..e8dedf26206 100644 --- a/app/views/projects/pipeline_schedules/_form.html.haml +++ b/app/views/projects/pipeline_schedules/_form.html.haml @@ -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 diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index 317949d6b56..2d43f7a10bc 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -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 |