diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 12446a209f8a37b68c9dee33c21ae127cfd78a32..488f49267c7526cea44b9be010fd64c850d68ee1 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -1,4 +1,7 @@
-%h4 Contributions calendar
+%h4
+  Contributions calendar
+  .pull-right
+    %small Issues, merge requests and push events
 #cal-heatmap.calendar
   :javascript
     new calendar(
diff --git a/features/steps/user.rb b/features/steps/user.rb
index e6086bfc1c97b373218165c713a626f033d22f80..5939c28a000facd2111fdea180d4f94766952519 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -35,7 +35,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
 
   step 'I should see contributions calendar' do
     within '.calendar' do
-      page.should have_css('.graph-rect.r2.q2')
+      page.should have_css('.graph-rect.r3.q3')
     end
   end
 
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb
index ea41644811f80f23fd47e55ca1137612d060736f..79e0a514f9eeb60602677b0c09678a8281c7bf9a 100644
--- a/lib/gitlab/contributions_calendar.rb
+++ b/lib/gitlab/contributions_calendar.rb
@@ -15,25 +15,20 @@ module Gitlab
       date_to = Date.today
 
       events = Event.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)').
+        select('date(created_at), count(id) as total_amount').
+        reorder(nil).map(&:attributes)
 
-      grouped_events = events.to_a.group_by { |event| event.created_at.to_date.to_s }
       dates = (1.year.ago.to_date..(Date.today + 1.day)).to_a
 
       dates.each do |date|
         date_id = date.to_time.to_i.to_s
         @timestamps[date_id] = 0
+        day_events = events.find { |day_events| day_events["date"] == date }
 
-        if grouped_events.has_key?(date.to_s)
-          grouped_events[date.to_s].each do |event|
-            if event.created_at.to_date == date
-              if event.issue? || event.merge_request?
-                @timestamps[date_id] += 1
-              elsif event.push?
-                @timestamps[date_id] += event.commits_count
-              end
-            end
-          end
+        if day_events
+          @timestamps[date_id] = day_events["total_amount"]
         end
       end