Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
be77d76e
Commit
be77d76e
authored
Jul 29, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use timezone-aware Date.current instead of Date.today in ContributionsCalendar class
parent
68de3ac1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/contributions_calendar.rb
lib/gitlab/contributions_calendar.rb
+2
-2
No files found.
lib/gitlab/contributions_calendar.rb
View file @
be77d76e
...
@@ -48,7 +48,7 @@ module Gitlab
...
@@ -48,7 +48,7 @@ module Gitlab
end
end
def
starting_month
def
starting_month
Date
.
today
.
month
Date
.
current
.
month
end
end
private
private
...
@@ -66,7 +66,7 @@ module Gitlab
...
@@ -66,7 +66,7 @@ module Gitlab
.
select
(
:id
)
.
select
(
:id
)
conditions
=
t
[
:created_at
].
gteq
(
date_from
.
beginning_of_day
)
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
))
.
and
(
t
[
:author_id
].
eq
(
contributor
.
id
))
Event
.
reorder
(
nil
)
Event
.
reorder
(
nil
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment