diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/views/admin/application_settings/_localization.html.haml | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/views/admin/application_settings/_localization.html.haml')
-rw-r--r-- | app/views/admin/application_settings/_localization.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_localization.html.haml b/app/views/admin/application_settings/_localization.html.haml index fdb91937ec3..5c8f3379fce 100644 --- a/app/views/admin/application_settings/_localization.html.haml +++ b/app/views/admin/application_settings/_localization.html.haml @@ -7,6 +7,7 @@ = f.select :first_day_of_week, first_day_of_week_choices, {}, class: 'form-control' .form-text.text-muted = _('Default first day of the week in calendars and date pickers.') + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/index.md', anchor: 'default-first-day-of-the-week'), target: '_blank' .form-group = f.label :time_tracking, _('Time tracking'), class: 'label-bold' @@ -14,5 +15,9 @@ = f.check_box :time_tracking_limit_to_hours, class: 'form-check-input' = f.label :time_tracking_limit_to_hours, class: 'form-check-label' do = _('Limit display of time tracking units to hours.') + .form-text.text-muted + = _('Display time tracking in issues in total hours only.') + = link_to _('What is time tracking?'), help_page_path('user/project/time_tracking.md'), target: '_blank' = f.submit _('Save changes'), class: "gl-button btn btn-confirm" + |