summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-07 15:15:07 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-07 15:15:07 +0000
commit5b83abcc01bd4a24268126dc52019b9f11152a7c (patch)
tree195d1b0b10dcaf5ae58472075d350812b270612e /app/helpers
parent25370fd158e95d9672340ac25d13ed51e8dc77af (diff)
parentee26c3cab4651c8876efc45b6a63539727e6a42e (diff)
downloadgitlab-ce-5b83abcc01bd4a24268126dc52019b9f11152a7c.tar.gz
Merge branch 'issue_14189' into 'master'
Ability to prioritize labels Closes #14189 See merge request !4009
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/sorting_helper.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 630e10ea892..d86f1999f5c 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -14,7 +14,8 @@ module SortingHelper
sort_value_recently_signin => sort_title_recently_signin,
sort_value_oldest_signin => sort_title_oldest_signin,
sort_value_downvotes => sort_title_downvotes,
- sort_value_upvotes => sort_title_upvotes
+ sort_value_upvotes => sort_title_upvotes,
+ sort_value_priority => sort_title_priority
}
end
@@ -28,6 +29,10 @@ module SortingHelper
}
end
+ def sort_title_priority
+ 'Priority'
+ end
+
def sort_title_oldest_updated
'Oldest updated'
end
@@ -84,6 +89,10 @@ module SortingHelper
'Most popular'
end
+ def sort_value_priority
+ 'priority'
+ end
+
def sort_value_oldest_updated
'updated_asc'
end