Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 18:06:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 18:06:26 +0300
commit69944ffb68788d190e81ff7e33db5dcb6c903184 (patch)
tree4112a1285f186c140749e8410a8a2788b6812500 /app/services/cohorts_service.rb
parent1b7381e998ff4b33ec8f633766030082e95f10c8 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/cohorts_service.rb')
-rw-r--r--app/services/cohorts_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/cohorts_service.rb b/app/services/cohorts_service.rb
index 97fbb70f350..dbbe89ef260 100644
--- a/app/services/cohorts_service.rb
+++ b/app/services/cohorts_service.rb
@@ -88,7 +88,7 @@ class CohortsService
User
.where('created_at > ?', MONTHS_INCLUDED.months.ago.end_of_month)
.group(created_at_month, last_activity_on_month)
- .reorder("#{created_at_month} ASC", "#{last_activity_on_month} ASC")
+ .reorder(Arel.sql("#{created_at_month} ASC, #{last_activity_on_month} ASC"))
.count
end
end