Commit 7ee1d68e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #9186 from Senorsen/patch-1

Fix contributions calendar empty problem under mysql
parents bafcee93 0cbafa4d
...@@ -17,7 +17,7 @@ module Gitlab ...@@ -17,7 +17,7 @@ module Gitlab
events = Event.reorder(nil).contributions.where(author_id: user.id). events = Event.reorder(nil).contributions.where(author_id: user.id).
where("created_at > ?", date_from).where(project_id: projects). where("created_at > ?", date_from).where(project_id: projects).
group('date(created_at)'). group('date(created_at)').
select('date(created_at), count(id) as total_amount'). select('date(created_at) as date, count(id) as total_amount').
map(&:attributes) map(&:attributes)
dates = (1.year.ago.to_date..(Date.today + 1.day)).to_a dates = (1.year.ago.to_date..(Date.today + 1.day)).to_a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment