diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-04-25 04:34:46 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-01 10:28:40 -0500 |
| commit | 3584e74eacfc101c64fe1305bbf97515e86ebc88 (patch) | |
| tree | f96e86f49cb62020e43af9007766a3cfce83e32f /app/views/shared/issuable | |
| parent | 623eb34f1a54607d5da5e79a41ffa03de2ae3285 (diff) | |
| download | gitlab-ce-3584e74eacfc101c64fe1305bbf97515e86ebc88.tar.gz | |
Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdown
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271
When the dropdown items are too wide, constrain the dropdown to the
offsetParent. Otherwise, let it naturally flow as Select2 wants.
Diffstat (limited to 'app/views/shared/issuable')
| -rw-r--r-- | app/views/shared/issuable/form/_branch_chooser.html.haml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/shared/issuable/form/_branch_chooser.html.haml b/app/views/shared/issuable/form/_branch_chooser.html.haml index 2793e7bcff4..f57b4d899ce 100644 --- a/app/views/shared/issuable/form/_branch_chooser.html.haml +++ b/app/views/shared/issuable/form/_branch_chooser.html.haml @@ -10,12 +10,16 @@ = form.label :source_branch, class: 'control-label' .col-sm-10 .issuable-form-select-holder - = form.select(:source_branch, [issuable.source_branch], {}, { class: 'source_branch select2 span2', disabled: true }) + = form.select(:source_branch, [issuable.source_branch], {}, { class: 'source_branch select2', disabled: true }) .form-group = form.label :target_branch, class: 'control-label' - .col-sm-10 + .col-sm-10.target-branch-select-dropdown-container .issuable-form-select-holder - = form.select(:target_branch, issuable.target_branches, { include_blank: true }, { class: 'target_branch select2 span2', disabled: issuable.new_record?, data: { placeholder: "Select branch" }}) + = form.select(:target_branch, issuable.target_branches, + { include_blank: true }, + { class: 'target_branch js-target-branch-select', + disabled: issuable.new_record?, + data: { placeholder: "Select branch" }}) - if issuable.new_record? = link_to 'Change branches', mr_change_branches_path(issuable) |