diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-15 21:46:04 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-08-16 12:31:22 -0500 |
| commit | 9568437d2160117dbd2bdc0698def7c57ec3e3ab (patch) | |
| tree | 49132a1510b7b4b1f91240cd657f664a98f8d79f | |
| parent | fd3e41f1539ded70c551bd6c2cf6c4dde0b6b619 (diff) | |
| download | gitlab-ce-9568437d2160117dbd2bdc0698def7c57ec3e3ab.tar.gz | |
Merge branch '20317-admin-cant-order-by-size' into 'master'
Allow to sort by project size on admin projects page
Fixes #20317
See merge request !5797
(cherry picked from commit dd2088b08dd89001c8b0da387bd1c928f6c69153)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/sorting_helper.rb | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index cc5b30781cc..22799a88032 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.10.6 - Upgrade Rails to 4.2.7.1 for security fixes. !5781 + - Restore "Largest repository" sort option on Admin > Projects page. !5797 - Fix privilege escalation via project export. - Require administrator privileges to perform a project import. diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index d86f1999f5c..3db995b289a 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -20,13 +20,19 @@ module SortingHelper end def projects_sort_options_hash - { + options = { sort_value_name => sort_title_name, sort_value_recently_updated => sort_title_recently_updated, sort_value_oldest_updated => sort_title_oldest_updated, sort_value_recently_created => sort_title_recently_created, sort_value_oldest_created => sort_title_oldest_created, } + + if current_controller?('admin/projects') + options.merge!(sort_value_largest_repo => sort_title_largest_repo) + end + + options end def sort_title_priority |