summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNur Rony <pro.nmrony@gmail.com>2016-11-10 14:39:30 +0600
committerNur Rony <pro.nmrony@gmail.com>2016-11-10 14:42:38 +0600
commit03077336244dbabb891cb7c74e93b8ef720a706d (patch)
treee76447b5aafe63fae719346b8c97dc3469622f64
parentc9e12e0163535ce2804f105edaba0d0cb66e89b3 (diff)
downloadgitlab-ce-21622-group-member-counter-and-sort.tar.gz
-rw-r--r--app/helpers/members_helper.rb2
-rw-r--r--app/helpers/sorting_helper.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 75c6b7aa63b..cf8fdfca1bd 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -40,7 +40,7 @@ module MembersHelper
def filter_group_project_member_path(options = {})
exist_opts = {
search: params[:search],
- sort: params[:sort],
+ sort: params[:sort]
}
options = exist_opts.merge(options)
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 4aa19b7d4cd..7e919145da4 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -42,8 +42,7 @@ module SortingHelper
sort_value_name => sort_title_name_asc,
sort_value_name_desc => sort_title_name_desc,
sort_value_recently_signin => sort_title_recently_signin,
- sort_value_oldest_signin => sort_title_oldest_signin,
-
+ sort_value_oldest_signin => sort_title_oldest_signin
}
end