Merge branch 'eggerd-master-patch-87554' into 'master'

Fix broken spec for private events being included in the calendar

See merge request gitlab-org/gitlab!74703

spec/lib/gitlab/contributions_calendar_spec.rb

@@ -67,12 +67,12 @@ RSpec.describe Gitlab::ContributionsCalendar do
 
     context "when the user has opted-in for private contributions" do
       it "shows private and public events to all users" do
-        user.update_column(:include_private_contributions, true)
+        contributor.update_column(:include_private_contributions, true)
         create_event(private_project, today)
         create_event(public_project, today)
 
-        expect(calendar.activity_dates[today]).to eq(1)
-        expect(calendar(user).activity_dates[today]).to eq(1)
+        expect(calendar.activity_dates[today]).to eq(2)
+        expect(calendar(user).activity_dates[today]).to eq(2)
         expect(calendar(contributor).activity_dates[today]).to eq(2)
       end
     end