summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-08-31 20:38:13 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-08-31 20:38:13 +0000
commitf5006d27e43754f571c01ddb3974046d7b8a25bb (patch)
treefed5dcf421c58e693f48e6ef463a16d8085185fd /lib/api/helpers
parenta7fd91a0cacc3e5e57585304fb40b02658c98ec6 (diff)
parentdde56a783752a08561b19cf3b7d0f53635801002 (diff)
downloadgitlab-ce-f5006d27e43754f571c01ddb3974046d7b8a25bb.tar.gz
Merge branch 'pretty-time-refactor' into 'master'
Add support for custom daysPerWeek and hoursPerDay to prettyTime.parseSeconds Closes gitlab-ee#3298 See merge request !13966
Diffstat (limited to 'lib/api/helpers')
0 files changed, 0 insertions, 0 deletions