summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-20 19:36:35 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-20 19:36:35 +0000
commit5bdab11f5ca35cc83b3b55d16d4e1bc0b8408e30 (patch)
tree110cf6dbebe0c7209c73dabbff89aab715a8456e /app/views/shared
parent85759f2c79af60b4903fedfcbc55e6d28979fd1d (diff)
parent06c4410948bb0e5a7efd6646e81f221dc3f10f08 (diff)
downloadgitlab-ce-5bdab11f5ca35cc83b3b55d16d4e1bc0b8408e30.tar.gz
Merge branch 'issue-filter-bar-alignment' into 'master'
Fixed filter bar alignment issues Closes #29543 See merge request !10049
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/_sort_dropdown.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index 367aa550a78..a212c714826 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -1,6 +1,5 @@
.dropdown.inline.prepend-left-10
%button.dropdown-toggle{ type: 'button', data: {toggle: 'dropdown' } }
- %span.light
- if @sort.present?
= sort_options_hash[@sort]
- else