diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-10-26 19:19:28 +0300 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-10-26 19:19:28 +0300 |
| commit | db80db793f43f9b4367730fc9b95c1925807f999 (patch) | |
| tree | 14d832bfc698dde546b31897b56679c90be42db6 /app/models | |
| parent | 1815aa561ac1428cd183a8dc5c662299f9fd19e2 (diff) | |
Replace deprecated uniq on a Relation with distinct
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/milestone.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 892a680f221..9efdee7b795 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -145,7 +145,7 @@ class Milestone < ActiveRecord::Base end def participants - User.joins(assigned_issues: :milestone).where("milestones.id = ?", id).uniq + User.joins(assigned_issues: :milestone).where("milestones.id = ?", id).distinct end def self.sort_by_attribute(method) diff --git a/app/models/user.rb b/app/models/user.rb index ca7fc3b058f..383b8f13d6b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1138,7 +1138,7 @@ class User < ActiveRecord::Base events = Event.select(:project_id) .contributions.where(author_id: self) .where("created_at > ?", Time.now - 1.year) - .uniq + .distinct .reorder(nil) Project.where(id: events) |