Merge branch 'compare-ellipsis-line' into 'master'

Fixed compare ellipsis messing with layout ## What does this MR do? Fixed a bug where the ellipsis would cause the form to mess with the layout. ## Screenshots (if relevant) ![Screen_Shot_2016-10-21_at_13.45.37](/uploads/d1dc18d294dace599b8036541b70ccaf/Screen_Shot_2016-10-21_at_13.45.37.png) See merge request !7042

Merge branch 'compare-ellipsis-line' into 'master'
0ba365f7 · Fatih Acet · 434ad2b9 · a74dfa30 · 0ba365f7
Commit 0ba365f7 authored Oct 21, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_form.html.haml app/views/projects/compare/_form.html.haml +1 -1

No files found.
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -10,7 +10,7 @@
        = button_tag type: 'button', class: "form-control compare-dropdown-toggle js-compare-dropdown", required: true, data: { refs_url: refs_namespace_project_path(@project.namespace, @project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do
          .dropdown-toggle-text= params[:from] || 'Select branch/tag'
      = render "ref_dropdown"
-    .compare-ellipsis ...
+    .compare-ellipsis.inline ...
    .form-group.dropdown.compare-form-group.to.js-compare-to-dropdown
      .input-group.inline-input-group
        %span.input-group-addon to