diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 11:59:31 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 14:58:28 -0200 |
| commit | e6957a6b4776c47e7f21bd7494e4efafa63501ca (patch) | |
| tree | 66ab48459cd56b8e89802b2d8fc4c71a3c425e17 | |
| parent | 4f6d1c1d70d744ff599ae9c51e1cbc3a3c23e13e (diff) | |
| download | gitlab-ce-e6957a6b4776c47e7f21bd7494e4efafa63501ca.tar.gz | |
Remove order by label type on LabelsFinder
| -rw-r--r-- | app/finders/labels_finder.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/labels_finder.rb b/app/finders/labels_finder.rb index a5802171b6c..6ace14a4bb5 100644 --- a/app/finders/labels_finder.rb +++ b/app/finders/labels_finder.rb @@ -31,7 +31,7 @@ class LabelsFinder < UnionFinder end def sort(items) - items.reorder(title: :asc, type: :desc) + items.reorder(title: :asc) end def with_title(items) diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index f8018fc3de0..8c2036a1cde 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -27,7 +27,7 @@ = render "shared/issuable/milestone_dropdown", selected: finder.milestones.try(:first), name: :milestone_title, show_any: true, show_upcoming: true .filter-item.inline.labels-filter - = render "shared/issuable/label_dropdown", selected: finder.labels.select(:title, :type).uniq, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" } + = render "shared/issuable/label_dropdown", selected: finder.labels.select(:title).uniq, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" } .filter-item.inline.reset-filters %a{href: page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search])} Reset filters |