Skip to content
代码片段 群组 项目
未验证 提交 8ddae769 编辑于 作者: Denys Mishunov's avatar Denys Mishunov 提交者: GitLab
浏览文件

Merge branch '414678-move-fullstop-top-out-of-learn-more-link' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
= f.label :remember_me_enabled, _('Remember me'), class: 'label-light' = f.label :remember_me_enabled, _('Remember me'), class: 'label-light'
- remember_me_help_link = help_page_path('user/profile/index', anchor: 'stay-signed-in-for-two-weeks') - remember_me_help_link = help_page_path('user/profile/index', anchor: 'stay-signed-in-for-two-weeks')
- remember_me_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: remember_me_help_link } - remember_me_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: remember_me_help_link }
= f.gitlab_ui_checkbox_component :remember_me_enabled, _('Allow users to extend their session'), help_text: _("Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more.%{link_end}").html_safe % { link_start: remember_me_help_link_start, link_end: '</a>'.html_safe } = f.gitlab_ui_checkbox_component :remember_me_enabled, _('Allow users to extend their session'), help_text: _("Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more%{link_end}.").html_safe % { link_start: remember_me_help_link_start, link_end: '</a>'.html_safe }
= render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f = render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f
= render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
= f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2' = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2'
.help-block .help-block
= _('Specify an email address regex pattern to identify default internal users.') = _('Specify an email address regex pattern to identify default internal users.')
= link_to _('Learn more.'), help_page_path('administration/external_users', anchor: 'set-a-new-user-to-external'), target: '_blank', rel: 'noopener noreferrer' #{link_to _('Learn more'), help_page_path('administration/external_users', anchor: 'set-a-new-user-to-external'), target: '_blank', rel: 'noopener noreferrer'}.
- unless Gitlab.com? - unless Gitlab.com?
.form-group .form-group
= f.label :deactivate_dormant_users, _('Dormant users'), class: 'label-bold' = f.label :deactivate_dormant_users, _('Dormant users'), class: 'label-bold'
- dormant_users_help_link = help_page_path('administration/moderate_users', anchor: 'automatically-deactivate-dormant-users') - dormant_users_help_link = help_page_path('administration/moderate_users', anchor: 'automatically-deactivate-dormant-users')
- dormant_users_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: dormant_users_help_link } - dormant_users_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: dormant_users_help_link }
= f.gitlab_ui_checkbox_component :deactivate_dormant_users, _('Deactivate dormant users after a period of inactivity'), help_text: _('Users can reactivate their account by signing in. %{link_start}Learn more.%{link_end}').html_safe % { link_start: dormant_users_help_link_start, link_end: '</a>'.html_safe } = f.gitlab_ui_checkbox_component :deactivate_dormant_users, _('Deactivate dormant users after a period of inactivity'), help_text: _('Users can reactivate their account by signing in. %{link_start}Learn more%{link_end}.').html_safe % { link_start: dormant_users_help_link_start, link_end: '</a>'.html_safe }
.form-group .form-group
= f.label :deactivate_dormant_users_period, _('Days of inactivity before deactivation'), class: 'label-light' = f.label :deactivate_dormant_users_period, _('Days of inactivity before deactivation'), class: 'label-light'
= f.number_field :deactivate_dormant_users_period, class: 'form-control gl-form-input', min: 90, required: true = f.number_field :deactivate_dormant_users_period, class: 'form-control gl-form-input', min: 90, required: true
......
...@@ -54494,7 +54494,7 @@ msgstr "" ...@@ -54494,7 +54494,7 @@ msgstr ""
msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled." msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled."
msgstr "" msgstr ""
   
msgid "Users can reactivate their account by signing in. %{link_start}Learn more.%{link_end}" msgid "Users can reactivate their account by signing in. %{link_start}Learn more%{link_end}."
msgstr "" msgstr ""
   
msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki." msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki."
...@@ -54503,7 +54503,7 @@ msgstr "" ...@@ -54503,7 +54503,7 @@ msgstr ""
msgid "Users can request access (if visibility is public or internal)" msgid "Users can request access (if visibility is public or internal)"
msgstr "" msgstr ""
   
msgid "Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more.%{link_end}" msgid "Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more%{link_end}."
msgstr "" msgstr ""
   
msgid "Users cannot be added to projects in this group" msgid "Users cannot be added to projects in this group"
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册