diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-05-18 17:07:46 +0000 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-05-18 17:07:46 +0000 |
| commit | a0655f5d0671cc7cf527cbc94a986e41723e4b3e (patch) | |
| tree | f5a88c25168cdff3a820d802004b08dbf3724a51 | |
| parent | 14b205319a2142957e6e9b0c8819f231b3a5131c (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11332.tar.gz | |
Resolve conflicts in pipeline schedules.9-2-stable-fix-conflicts-for-mr-11332
| -rw-r--r-- | app/views/projects/pipeline_schedules/_form.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml index 44afb74ad43..7b312a52a00 100644 --- a/app/views/projects/pipeline_schedules/_form.html.haml +++ b/app/views/projects/pipeline_schedules/_form.html.haml @@ -19,11 +19,7 @@ .form-group .col-md-9 = f.label :ref, 'Target Branch', class: 'label-light' -<<<<<<< HEAD - = dropdown_tag("Select target branch", options: { toggle_class: 'btn js-target-branch-dropdown', title: "Select target branch", filter: true, placeholder: "Filter", data: { data: @project.repository.branch_names } } ) -======= = 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 } } ) ->>>>>>> 9fde881... Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' into 'master'
= f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true .form-group .col-md-9 |