Skip to content

Update time_helper.rb to fix output for exact minutes.

Marcel Amirault requested to merge (removed):syntax-test-branch into master

What does this MR do?

Time Helper outputs, for example, "This import will time out in 180 minutes 0 seconds". This MR adds a check for exact minutes, and outputs only minutes if the time is a multiple of 60 seconds. EDIT: The MR was updated to improve the sentence to "180 minutes and XX seconds" as well.

Are there points in the code the reviewer needs to double check?

I've only just started dipping my toes into Ruby and Rails, so please make sure I got the syntax right (I'm pretty sure the logic is fine).

Screenshots (if relevant)

import-project

Does this MR meet the acceptance criteria?

  • Conform by the code review guidelines
    • Has been reviewed by a UX Designer
    • Has been reviewed by a Frontend maintainer
    • Has been reviewed by a Backend maintainer
    • Has been reviewed by a Database specialist
  • Conform by the merge request performance guides
  • Conform by the style guides
  • End-to-end tests pass (package-and-qa manual pipeline job)

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48948

Edited by Marcel Amirault

Merge request reports