Merge remote-tracking branch 'upstream/pull/5786'

diff --git a/app/controllers/issues/reporters_controller.rb b/app/controllers/issues/reporters_controller.rb
index b6513f443f8b6052ed7de91aa1f459f2fa4e7eee..9e195df787284d3ace2a6083fefefa761ab30246 100644 (file)
--- a/app/controllers/issues/reporters_controller.rb
+++ b/app/controllers/issues/reporters_controller.rb
@@ -11,7 +11,7 @@ module Issues
     def index
       @issue = Issue.visible_to(current_user).find(params[:issue_id])
 
-      user_ids = @issue.reports.order(:created_at => :desc).pluck(:user_id).uniq
+      user_ids = @issue.reports.reorder(:created_at => :desc).pluck(:user_id).uniq
       @unique_reporters = {
         @issue.id => {
           :count => user_ids.size,

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 640317ce7f29ba6571f5ec0b26553039f5859798..56c0bbdf02e642b74291c8089379688bf7e91cde 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -47,7 +47,7 @@ class IssuesController < ApplicationController
 
     @unique_reporters_limit = 3
     @unique_reporters = @issues.each_with_object({}) do |issue, reporters|
-      user_ids = issue.reports.order(:created_at => :desc).pluck(:user_id).uniq
+      user_ids = issue.reports.reorder(:created_at => :desc).pluck(:user_id).uniq
       reporters[issue.id] = {
         :count => user_ids.size,
         :users => User.in_order_of(:id, user_ids.first(@unique_reporters_limit))

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a3f82ee40b11881bddf5d5226404f8209668f614..970426715183fab78bfafceca4cfbfcf063c8bfb 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -36,7 +36,7 @@ class Issue < ApplicationRecord
   belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by, :optional => true
   belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by, :optional => true
 
-  has_many :reports, :dependent => :destroy
+  has_many :reports, -> { order(:id) }, :dependent => :destroy
   has_many :comments, :class_name => "IssueComment", :dependent => :destroy
 
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }