1 files changed, 15 insertions, 8 deletions

diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb
index 4c28489f45a..1ffc2639237 100644
--- a/lib/gitlab/contributions_calendar.rb
+++ b/lib/gitlab/contributions_calendar.rb
@@ -7,9 +7,14 @@ module Gitlab
     def initialize(contributor, current_user = nil)
       @contributor = contributor
       @current_user = current_user
-      @projects = ContributedProjectsFinder.new(contributor).execute(current_user)
+      @projects = if @contributor.include_private_contributions?
+                    ContributedProjectsFinder.new(@contributor).execute(@contributor)
+                  else
+                    ContributedProjectsFinder.new(contributor).execute(current_user)
+                  end
     end
 
+    # rubocop: disable CodeReuse/ActiveRecord
     def activity_dates
       return @activity_dates if @activity_dates.present?
 
@@ -25,25 +30,25 @@ module Gitlab
       note_events = event_counts(date_from, :merge_requests)
         .having(action: [Event::COMMENTED])
 
-      union = Gitlab::SQL::Union.new([repo_events, issue_events, mr_events, note_events])
-      events = Event.find_by_sql(union.to_sql).map(&:attributes)
+      events = Event
+        .from_union([repo_events, issue_events, mr_events, note_events])
+        .map(&:attributes)
 
       @activity_dates = events.each_with_object(Hash.new {|h, k| h[k] = 0 }) do |event, activities|
         activities[event["date"]] += event["total_amount"]
       end
     end
+    # rubocop: enable CodeReuse/ActiveRecord
 
+    # rubocop: disable CodeReuse/ActiveRecord
     def events_by_date(date)
       return Event.none unless can_read_cross_project?
 
-      events = Event.contributions.where(author_id: contributor.id)
+      Event.contributions.where(author_id: contributor.id)
         .where(created_at: date.beginning_of_day..date.end_of_day)
         .where(project_id: projects)
-
-      # Use visible_to_user? instead of the complicated logic in activity_dates
-      # because we're only viewing the events for a single day.
-      events.select { |event| event.visible_to_user?(current_user) }
     end
+    # rubocop: enable CodeReuse/ActiveRecord
 
     def starting_year
       1.year.ago.year
@@ -59,6 +64,7 @@ module Gitlab
       Ability.allowed?(current_user, :read_cross_project)
     end
 
+    # rubocop: disable CodeReuse/ActiveRecord
     def event_counts(date_from, feature)
       t = Event.arel_table
 
@@ -87,5 +93,6 @@ module Gitlab
         .where(conditions)
         .where("events.project_id in (#{authed_projects.to_sql})") # rubocop:disable GitlabSecurity/SqlInjection
     end
+    # rubocop: enable CodeReuse/ActiveRecord
   end
 end