summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-07-29 00:36:54 -0500
committerMike Greiling <mike@pixelcog.com>2017-07-29 00:36:54 -0500
commitbe77d76e7338ee40ecdad54cc40b3b5afa55f2b1 (patch)
tree0be98aeb21abc5a7c2f4ffcc540652492be3fa88
parent68de3ac129c59dc168bdef84b47954d684d5f074 (diff)
downloadgitlab-ce-be77d76e7338ee40ecdad54cc40b3b5afa55f2b1.tar.gz
use timezone-aware Date.current instead of Date.today in ContributionsCalendar class
-rw-r--r--lib/gitlab/contributions_calendar.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb
index bf557103cfd..b3d84e4b6d5 100644
--- a/lib/gitlab/contributions_calendar.rb
+++ b/lib/gitlab/contributions_calendar.rb
@@ -48,7 +48,7 @@ module Gitlab
end
def starting_month
- Date.today.month
+ Date.current.month
end
private
@@ -66,7 +66,7 @@ module Gitlab
.select(:id)
conditions = t[:created_at].gteq(date_from.beginning_of_day)
- .and(t[:created_at].lteq(Date.today.end_of_day))
+ .and(t[:created_at].lteq(Date.current.end_of_day))
.and(t[:author_id].eq(contributor.id))
Event.reorder(nil)