diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-25 07:58:26 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-25 07:58:26 +0000 |
| commit | ed8605c42e46263d0aec58062ddd80f5511d0014 (patch) | |
| tree | a9212613674c52b2b83ac47e478522c61347badb /doc | |
| parent | fc5475b461f902464f156e13dda19fc276b62031 (diff) | |
| parent | 275a17589c2d468d8671a9f754a50b212273d509 (diff) | |
| download | gitlab-ce-ed8605c42e46263d0aec58062ddd80f5511d0014.tar.gz | |
Merge branch '30355-use-hours-only-for-time-tracking' into 'master'
Limit time tracking units to hours
Closes #30355
See merge request gitlab-org/gitlab-ce!29469
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/settings.md | 1 | ||||
| -rw-r--r-- | doc/workflow/time_tracking.md | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index c2a1f7feefd..eb3f39e6670 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -231,6 +231,7 @@ are listed in the descriptions of the relevant settings. | `throttle_unauthenticated_enabled` | boolean | no | (**If enabled, requires:** `throttle_unauthenticated_period_in_seconds` and `throttle_unauthenticated_requests_per_period`) Enable unauthenticated request rate limit. Helps reduce request volume (e.g. from crawlers or abusive bots). | | `throttle_unauthenticated_period_in_seconds` | integer | required by: `throttle_unauthenticated_enabled` | Rate limit period in seconds. | | `throttle_unauthenticated_requests_per_period` | integer | required by: `throttle_unauthenticated_enabled` | Max requests per period per IP. | +| `time_tracking_limit_to_hours` | boolean | no | Limit display of time tracking units to hours. Default is `false`. | | `two_factor_grace_period` | integer | required by: `require_two_factor_authentication` | Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication. | | `unique_ips_limit_enabled` | boolean | no | (**If enabled, requires:** `unique_ips_limit_per_user` and `unique_ips_limit_time_window`) Limit sign in from multiple ips. | | `unique_ips_limit_per_user` | integer | required by: `unique_ips_limit_enabled` | Maximum number of ips per user. | diff --git a/doc/workflow/time_tracking.md b/doc/workflow/time_tracking.md index c03dffa967d..4286a3625a2 100644 --- a/doc/workflow/time_tracking.md +++ b/doc/workflow/time_tracking.md @@ -73,7 +73,15 @@ The following time units are available: Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h. -Other interesting links: +### Limit displayed units to hours + +> Introduced in GitLab 12.0. + +The display of time units can be limited to hours through the option in **Admin Area > Settings > Preferences** under 'Localization'. + +With this option enabled, `75h` is displayed instead of `1w 4d 3h`. + +## Other interesting links - [Time Tracking landing page on about.gitlab.com](https://about.gitlab.com/solutions/time-tracking/) |