diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-11 18:40:01 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-25 09:31:23 +0800 |
| commit | 275a17589c2d468d8671a9f754a50b212273d509 (patch) | |
| tree | fb491229331aa09e74fd14385b0682e693774395 /doc | |
| parent | 4e283ee706b11fd3b918230976addc9a70603ce6 (diff) | |
| download | gitlab-ce-275a17589c2d468d8671a9f754a50b212273d509.tar.gz | |
Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-tracking
Changes migration and all other places the attribute is used
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/settings.md | 2 | ||||
| -rw-r--r-- | doc/workflow/time_tracking.md | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 7363b43393f..eb3f39e6670 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -231,7 +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_display_hours_only` | boolean | no | Limit time tracking values to hours only. Default is `false`. | +| `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/) |