diff options
author | Stan Hu <stanhu@gmail.com> | 2016-07-21 11:12:37 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-07-21 11:12:37 +0000 |
commit | 57e97a735ed3a5b9faf2d39bec460123623b2de6 (patch) | |
tree | c8e2078016d37295c5f91d8f729cacd074b2b38b /CHANGELOG | |
parent | 1459aa77bb998b838d8ad1c1abc73b1a69635357 (diff) | |
parent | 71a3336dc4f241e00c006a222397e62b039672ed (diff) | |
download | gitlab-ce-57e97a735ed3a5b9faf2d39bec460123623b2de6.tar.gz |
Merge branch '20055-build-duration-showing-too-many-digits' into 'master'
Cast duration to integer in `TimeHelper#time_interval_in_words`
Fixes #20055.
- [x] No CHANGELOG since it fixes a regression introduced in RC12.
- 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 !5391
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions