diff options
| author | Camil Staps <info@camilstaps.nl> | 2019-08-03 12:57:33 +0200 |
|---|---|---|
| committer | Camil Staps <info@camilstaps.nl> | 2019-08-07 20:49:37 +0200 |
| commit | e726ed5e128893158f102b87e1407ec0a36fc3ce (patch) | |
| tree | 279a9ccc0f22a461da6a4298bc803d60cffc32b1 /app/models/users_star_project.rb | |
| parent | d2b2486afb5a50ace08bc416be87a1ead12abe3c (diff) | |
| download | gitlab-ce-e726ed5e128893158f102b87e1407ec0a36fc3ce.tar.gz | |
Handle reviewer comments on !24690
Diffstat (limited to 'app/models/users_star_project.rb')
| -rw-r--r-- | app/models/users_star_project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/users_star_project.rb b/app/models/users_star_project.rb index 04a48739d93..baf055dd6dd 100644 --- a/app/models/users_star_project.rb +++ b/app/models/users_star_project.rb @@ -12,8 +12,8 @@ class UsersStarProject < ApplicationRecord alias_attribute :starred_since, :created_at - scope :order_user_name_asc, -> { joins(:user).reorder('users.name ASC') } - scope :order_user_name_desc, -> { joins(:user).reorder('users.name DESC') } + scope :order_user_name_asc, -> { joins(:user).merge(User.order_name_asc) } + scope :order_user_name_desc, -> { joins(:user).merge(User.order_name_desc) } scope :by_project, -> (project) { where(project_id: project.id) } scope :with_visible_profile, -> (user) { joins(:user).merge(User.with_visible_profile(user)) } |