root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Fatih Acet 2016-10-21 15:03:39 +00:00
parent 434ad2b927 a74dfa301e
commit 0ba365f745
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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