diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-22 18:06:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-22 18:06:00 +0000 |
| commit | ea4762d464bb36f3e36e318db47086e41f493377 (patch) | |
| tree | c2fb2b7d2eb2b775d9ab149dc3781975fcc4b7d5 /app/controllers/concerns/cycle_analytics_params.rb | |
| parent | 68b6846fa6c7b630cc8dab7a8474dcc34e4d67d4 (diff) | |
| download | gitlab-ce-ea4762d464bb36f3e36e318db47086e41f493377.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns/cycle_analytics_params.rb')
| -rw-r--r-- | app/controllers/concerns/cycle_analytics_params.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/cycle_analytics_params.rb b/app/controllers/concerns/cycle_analytics_params.rb index 1645af695be..a78d803927c 100644 --- a/app/controllers/concerns/cycle_analytics_params.rb +++ b/app/controllers/concerns/cycle_analytics_params.rb @@ -38,7 +38,8 @@ module CycleAnalyticsParams end def to_utc_time(field) - Date.parse(field).to_time.utc + date = field.is_a?(Date) ? field : Date.parse(field) + date.to_time.utc end end |