diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-21 11:12:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 13:16:56 +0200 |
| commit | 3ea982fccd2510964d3d7a60a48c496ff086d444 (patch) | |
| tree | 863c90aa63cf7ccb5114861eda807cc8a79fd126 /spec/tasks/gitlab | |
| parent | 478116f066776f23a959738c74a53d5d5f8e03c0 (diff) | |
| download | gitlab-ce-3ea982fccd2510964d3d7a60a48c496ff086d444.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 'spec/tasks/gitlab')
0 files changed, 0 insertions, 0 deletions