diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 12:43:32 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 12:43:32 +0100 |
| commit | eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a (patch) | |
| tree | 9dc7d17953ee7851e1934903b45faf5f18d860a2 /app/helpers/namespaces_helper.rb | |
| parent | 1b97a2eee8b89320de891e3ae8496adfa7f3a84b (diff) | |
| parent | b7ac654b88aa9b03f431d93c25e397ff2bc66a7a (diff) | |
| download | gitlab-ce-eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a.tar.gz | |
Merge branch 'master' into fixes/api
Conflicts:
spec/requests/api/projects_spec.rb
Diffstat (limited to 'app/helpers/namespaces_helper.rb')
| -rw-r--r-- | app/helpers/namespaces_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb index 6d0c6c98191..a9a6c78654f 100644 --- a/app/helpers/namespaces_helper.rb +++ b/app/helpers/namespaces_helper.rb @@ -10,8 +10,8 @@ module NamespacesHelper global_opts = ["Global", [['/', Namespace.global_id]] ] - group_opts = ["Groups", groups.map {|g| [g.human_name, g.id]} ] - users_opts = [ "Users", users.map {|u| [u.human_name, u.id]} ] + group_opts = ["Groups", groups.sort_by(&:human_name).map {|g| [g.human_name, g.id]} ] + users_opts = [ "Users", users.sort_by(&:human_name).map {|u| [u.human_name, u.id]} ] options = [] options << global_opts if current_user.admin |