-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch '19937-fix-wrong-build-elapsed-time' into 'master'
Fix build duration when build is not finished yet ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Fixes #19937. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5323
Showing
- app/helpers/time_helper.rb 13 additions, 13 deletionsapp/helpers/time_helper.rb
- app/views/projects/builds/_sidebar.html.haml 1 addition, 1 deletionapp/views/projects/builds/_sidebar.html.haml
- app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml 1 addition, 1 deletion.../generic_commit_statuses/_generic_commit_status.html.haml
- spec/helpers/time_helper_spec.rb 11 additions, 14 deletionsspec/helpers/time_helper_spec.rb
Loading
Please register or sign in to comment