Commit a56ab410 authored by Peter Hegman's avatar Peter Hegman

Merge branch 'fneill-okr-group-settings' into 'master'

Review UI text: Group > Settings

See merge request gitlab-org/gitlab!72703
parents 265c31b0 471e729f
...@@ -16,13 +16,14 @@ ...@@ -16,13 +16,14 @@
= f.check_box :confidential, class: 'form-check-input' = f.check_box :confidential, class: 'form-check-input'
= f.label :confidential, class: 'label-bold form-check-label' = f.label :confidential, class: 'label-bold form-check-label'
%span.form-text.text-muted %span.form-text.text-muted
= _('The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.') = _('Enable only for confidential applications exclusively used by a trusted backend server that can securely store the client secret. Do not enable for native-mobile, single-page, or other JavaScript applications because they cannot keep the client secret confidential.')
.form-group.form-check .form-group.form-check
= f.check_box :expire_access_tokens, class: 'form-check-input' = f.check_box :expire_access_tokens, class: 'form-check-input'
= f.label :expire_access_tokens, class: 'label-bold form-check-label' = f.label :expire_access_tokens, class: 'label-bold form-check-label'
%span.form-text.text-muted %span.form-text.text-muted
= _('Access tokens expire after 2 hours. A refresh token may be used at any time to generate a new access token. Non-expiring access tokens are deprecated. Clear this setting to enable backward compatibility.') = _('Enable access tokens to expire after 2 hours. If disabled, tokens do not expire.')
= link_to _('Learn more.'), help_page_path('integration/oauth_provider.md', anchor: 'expiring-access-tokens'), target: '_blank', rel: 'noopener noreferrer'
.form-group .form-group
= f.label :scopes, class: 'label-bold' = f.label :scopes, class: 'label-bold'
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- if oauth_authorized_applications_enabled - if oauth_authorized_applications_enabled
= _("Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account.") = _("Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account.")
- else - else
= _("Manage applications that can use GitLab as an OAuth provider.") = _("Manage applications that use GitLab as an OAuth provider.")
- else - else
= _("Manage applications that you've authorized to use your account.") = _("Manage applications that you've authorized to use your account.")
.col-lg-8 .col-lg-8
......
...@@ -12938,6 +12938,9 @@ msgstr "" ...@@ -12938,6 +12938,9 @@ msgstr ""
msgid "Enable access to the performance bar for non-administrators in a given group." msgid "Enable access to the performance bar for non-administrators in a given group."
msgstr "" msgstr ""
msgid "Enable access tokens to expire after 2 hours. If disabled, tokens do not expire."
msgstr ""
msgid "Enable admin mode" msgid "Enable admin mode"
msgstr "" msgstr ""
...@@ -13010,6 +13013,9 @@ msgstr "" ...@@ -13010,6 +13013,9 @@ msgstr ""
msgid "Enable multipart emails" msgid "Enable multipart emails"
msgstr "" msgstr ""
msgid "Enable only for confidential applications exclusively used by a trusted backend server that can securely store the client secret. Do not enable for native-mobile, single-page, or other JavaScript applications because they cannot keep the client secret confidential."
msgstr ""
msgid "Enable or disable the Pseudonymizer data collection." msgid "Enable or disable the Pseudonymizer data collection."
msgstr "" msgstr ""
...@@ -21256,7 +21262,7 @@ msgstr "" ...@@ -21256,7 +21262,7 @@ msgstr ""
msgid "Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account." msgid "Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account."
msgstr "" msgstr ""
msgid "Manage applications that can use GitLab as an OAuth provider." msgid "Manage applications that use GitLab as an OAuth provider."
msgstr "" msgstr ""
msgid "Manage applications that you've authorized to use your account." msgid "Manage applications that you've authorized to use your account."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment