summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-09-08 21:07:52 +0300
committerValery Sizov <valery@gitlab.com>2017-09-08 21:07:52 +0300
commitd0a2bd579f1ab15df8d0c24148546c1257c1868c (patch)
tree77638c0072e8afd1af18842dac4ae03af9197864
parente29bc0af10e5b456d3765cb63c3dfe8f7a46522e (diff)
downloadgitlab-ce-d0a2bd579f1ab15df8d0c24148546c1257c1868c.tar.gz
[rails 5] Fix for lib/gitlab/contributions_calendar.rb
This fixes arel query
-rw-r--r--lib/gitlab/contributions_calendar.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb
index 0735243e021..e5a76555755 100644
--- a/lib/gitlab/contributions_calendar.rb
+++ b/lib/gitlab/contributions_calendar.rb
@@ -79,7 +79,7 @@ module Gitlab
.select(t[:project_id], t[:target_type], t[:action], "date(created_at + #{date_interval}) AS date", 'count(id) as total_amount')
.group(t[:project_id], t[:target_type], t[:action], "date(created_at + #{date_interval})")
.where(conditions)
- .having(t[:project_id].in(Arel::Nodes::SqlLiteral.new(authed_projects.to_sql)))
+ .having(project_id: authed_projects)
end
end
end