diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-05 09:22:47 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-05 09:22:47 -0700 |
| commit | 600ea9f7b7af43acd7ee48ce13a3612c1f3c09fe (patch) | |
| tree | b7235973b04f563caf745873c191b2704b929585 /app/helpers | |
| parent | ce28f1b7b0b7dc9e7377ae14009de9c11fd229e4 (diff) | |
| parent | cb320f41388a62e3d59e7e4cdb7ea0b6d26dae66 (diff) | |
| download | gitlab-ci-600ea9f7b7af43acd7ee48ce13a3612c1f3c09fe.tar.gz | |
Merge pull request #141 from Deradon/patch-1
Fix Build#duration when TimeZone is not UTC
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/builds_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb index c247d39..0f15f84 100644 --- a/app/helpers/builds_helper.rb +++ b/app/helpers/builds_helper.rb @@ -2,7 +2,7 @@ module BuildsHelper def build_duration build if build.started? from = build.started_at - to = build.finished_at || Time.now + to = build.finished_at || Time.zone.now distance_of_time_in_words(from, to) end end |