Skip to content

G
gitlab-ce
Commit 15b1ccba authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Merge branch 'russell/improve-sign-in-settings-ui-text' into 'master' 

Improve Sign-in restrictions UI text

See merge request gitlab-org/gitlab!67095
parents 9bfde3bd 9582fd83
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 47 deletions
app/views/admin/application_settings/_signin.html.haml
View file @ 15b1ccba
......@@ -6,22 +6,22 @@
.form-check
= f.check_box :password_authentication_enabled_for_web, class: 'form-check-input'
= f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
= _('Password authentication enabled for web interface')
= _('Allow password authentication for the web interface')
.form-text.text-muted
= _('When disabled, an external authentication provider must be used.')
= _('When inactive, an external authentication provider must be used.')
.form-group
.form-check
= f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
= f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
= _('Password authentication enabled for Git over HTTP(S)')
= _('Allow password authentication for Git over HTTP(S)')
.form-text.text-muted
When disabled, a Personal Access Token
When inactive, a Personal Access Token
- if Gitlab::Auth::Ldap::Config.enabled?
or LDAP password
must be used to authenticate.
- if omniauth_enabled? && button_based_providers.any?
%fieldset.form-group
%legend.gl-font-base.gl-mb-3.gl-border-none.gl-font-weight-bold= _('Enabled OAuth sign-in sources')
%legend.gl-font-base.gl-mb-3.gl-border-none.gl-font-weight-bold= _('Enabled OAuth authentication sources')
= hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]'
- oauth_providers_checkboxes.each do |source|
= source
......@@ -30,39 +30,44 @@
.form-check
= f.check_box :require_two_factor_authentication, class: 'form-check-input'
= f.label :require_two_factor_authentication, class: 'form-check-label' do
= _('Require all users to set up two-factor authentication')
= _('Enforce two-factor authentication')
%p.form-text.text-muted
= _('Enforce two-factor authentication for all user sign-ins.')
= link_to _('Learn more.'), help_page_path('security/two_factor_authentication.md'), target: '_blank', rel: 'noopener noreferrer'
.form-group
= f.label :two_factor_authentication, _('Two-factor grace period'), class: 'label-bold'
= f.number_field :two_factor_grace_period, min: 0, class: 'form-control gl-form-input', placeholder: '0'
.form-text.text-muted
= _('Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in.')
.form-group
= f.label :admin_mode, _('Admin Mode'), class: 'label-bold'
= sprite_icon('lock', css_class: 'gl-icon')
.form-check
= f.check_box :admin_mode, class: 'form-check-input'
= f.label :admin_mode, class: 'form-check-label' do
= _('Require additional authentication for administrative tasks')
.form-text.text-muted
= link_to _('Learn more.'), help_page_path('user/admin_area/settings/sign_in_restrictions', anchor: 'admin-mode')
= _('Enable admin mode')
%p.form-text.text-muted
= _('Require additional authentication for administrative tasks.')
= link_to _('Learn more.'), help_page_path('user/admin_area/settings/sign_in_restrictions', anchor: 'admin-mode'), target: '_blank', rel: 'noopener noreferrer'
.form-group
= f.label :unknown_sign_in, _('Email notification for unknown sign-ins'), class: 'label-bold'
.form-check
= f.check_box :notify_on_unknown_sign_in, class: 'form-check-input'
= f.label :notify_on_unknown_sign_in, class: 'form-check-label' do
= _('Notify users by email when sign-in location is not recognized')
= link_to sprite_icon('question-o'),
'https://docs.gitlab.com/ee/user/profile/unknown_sign_in_notification.html',
target: '_blank'
.form-group
= f.label :two_factor_authentication, _('Two-factor grace period (hours)'), class: 'label-bold'
= f.number_field :two_factor_grace_period, min: 0, class: 'form-control gl-form-input', placeholder: '0'
.form-text.text-muted= _('Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication')
= _('Enable email notification')
%p.form-text.text-muted
= _('Notify users by email when sign-in location is not recognized.')
= link_to _('Learn more.'), help_page_path('user/profile/unknown_sign_in_notification.md'), target: '_blank', rel: 'noopener noreferrer'
.form-group
= f.label :home_page_url, _('Home page URL'), class: 'label-bold'
= f.text_field :home_page_url, class: 'form-control gl-form-input', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
%span.form-text.text-muted#home_help_block= _("We will redirect non-logged in users to this page")
%span.form-text.text-muted#home_help_block= _("Direct non-authenticated users to this page.")
.form-group
= f.label :after_sign_out_path, _('After sign-out path'), class: 'label-bold'
= f.label :after_sign_out_path, _('Sign-out page URL'), class: 'label-bold'
= f.text_field :after_sign_out_path, class: 'form-control gl-form-input', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
%span.form-text.text-muted#after_sign_out_path_help_block= _("We will redirect users to this page after they sign out")
%span.form-text.text-muted#home_help_block= _("Direct users to this page after they sign out.")
.form-group
= f.label :sign_in_text, _('Sign-in text'), class: 'label-bold'
= f.text_area :sign_in_text, class: 'form-control gl-form-input', rows: 4
.form-text.text-muted Markdown enabled
%span.form-text.text-muted#home_help_block= _("Add text to the sign-in page. Markdown enabled.")
= f.submit _('Save changes'), class: "gl-button btn btn-confirm"
app/views/admin/application_settings/general.html.haml
View file @ 15b1ccba
......@@ -53,7 +53,8 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand')
%p
= _('Set requirements for a user to sign-in. Enable mandatory two-factor authentication.')
= _('Set sign-in restrictions for all users.')
= link_to _('Learn more.'), help_page_path('user/admin_area/settings/sign_in_restrictions.md'), target: '_blank', rel: 'noopener noreferrer'
.settings-content
= render 'signin'
......
locale/gitlab.pot
View file @ 15b1ccba
......@@ -2056,6 +2056,9 @@ msgstr ""
msgid "Add system hook"
msgstr ""
msgid "Add text to the sign-in page. Markdown enabled."
msgstr ""
msgid "Add to Slack"
msgstr ""
......@@ -2872,9 +2875,6 @@ msgstr ""
msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
msgstr ""
msgid "After sign-out path"
msgstr ""
msgid "After that, you will not be able to use merge approvals or code quality as well as many other features."
msgstr ""
......@@ -3327,6 +3327,12 @@ msgstr ""
msgid "Allow owners to manually add users outside of LDAP"
msgstr ""
msgid "Allow password authentication for Git over HTTP(S)"
msgstr ""
msgid "Allow password authentication for the web interface"
msgstr ""
msgid "Allow project maintainers to configure repository mirroring"
msgstr ""
......@@ -11583,6 +11589,12 @@ msgstr ""
msgid "Direct member"
msgstr ""
msgid "Direct non-authenticated users to this page."
msgstr ""
msgid "Direct users to this page after they sign out."
msgstr ""
msgid "Direction"
msgstr ""
......@@ -12275,6 +12287,9 @@ msgstr ""
msgid "Enable access to the performance bar for non-administrators in a given group."
msgstr ""
msgid "Enable admin mode"
msgstr ""
msgid "Enable and disable Service Desk. Some additional configuration might be required. %{link_start}Learn more%{link_end}."
msgstr ""
......@@ -12296,6 +12311,9 @@ msgstr ""
msgid "Enable delayed project deletion by default for newly-created groups."
msgstr ""
msgid "Enable email notification"
msgstr ""
msgid "Enable error tracking"
msgstr ""
......@@ -12410,7 +12428,7 @@ msgstr ""
msgid "Enabled Git access protocols"
msgstr ""
msgid "Enabled OAuth sign-in sources"
msgid "Enabled OAuth authentication sources"
msgstr ""
msgid "Enabled sources for code import during project creation. OmniAuth must be configured for GitHub"
......@@ -12446,6 +12464,12 @@ msgstr ""
msgid "Enforce personal access token expiration"
msgstr ""
msgid "Enforce two-factor authentication"
msgstr ""
msgid "Enforce two-factor authentication for all user sign-ins."
msgstr ""
msgid "Ensure connectivity is available from the GitLab server to the Prometheus server"
msgstr ""
......@@ -20544,6 +20568,9 @@ msgstr ""
msgid "Maximum time for web terminal websocket connection (in seconds). 0 for unlimited."
msgstr ""
msgid "Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in."
msgstr ""
msgid "May"
msgstr ""
......@@ -22864,7 +22891,7 @@ msgstr ""
msgid "Notifications on"
msgstr ""
msgid "Notify users by email when sign-in location is not recognized"
msgid "Notify users by email when sign-in location is not recognized."
msgstr ""
msgid "Nov"
......@@ -23952,12 +23979,6 @@ msgstr ""
msgid "Password (optional)"
msgstr ""
msgid "Password authentication enabled for Git over HTTP(S)"
msgstr ""
msgid "Password authentication enabled for web interface"
msgstr ""
msgid "Password authentication is unavailable."
msgstr ""
......@@ -28152,7 +28173,7 @@ msgstr ""
msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The allowlist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com."
msgstr ""
msgid "Require additional authentication for administrative tasks"
msgid "Require additional authentication for administrative tasks."
msgstr ""
msgid "Require all users in this group to setup Two-factor authentication"
......@@ -28161,9 +28182,6 @@ msgstr ""
msgid "Require all users in this group to setup two-factor authentication"
msgstr ""
msgid "Require all users to set up two-factor authentication"
msgstr ""
msgid "Required approvals (%{approvals_given} given)"
msgstr ""
......@@ -30219,10 +30237,10 @@ msgstr ""
msgid "Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan."
msgstr ""
msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication."
msgid "Set severity"
msgstr ""
msgid "Set severity"
msgid "Set sign-in restrictions for all users."
msgstr ""
msgid "Set size limits for displaying diffs in the browser."
......@@ -30661,6 +30679,9 @@ msgstr ""
msgid "Sign-in text"
msgstr ""
msgid "Sign-out page URL"
msgstr ""
msgid "Sign-up restrictions"
msgstr ""
......@@ -35191,7 +35212,7 @@ msgstr ""
msgid "Two-factor authentication is not enabled for this user"
msgstr ""
msgid "Two-factor grace period (hours)"
msgid "Two-factor grace period"
msgstr ""
msgid "Type"
......@@ -37016,12 +37037,6 @@ msgstr ""
msgid "We will notify %{inviter} that you declined their invitation to join GitLab. You will stop receiving reminders."
msgstr ""
msgid "We will redirect non-logged in users to this page"
msgstr ""
msgid "We will redirect users to this page after they sign out"
msgstr ""
msgid "We would like to inform you that your subscription GitLab Enterprise Edition %{plan_name} is nearing its user limit. You have %{active_user_count} active users, which is almost at the user limit of %{maximum_user_count}."
msgstr ""
......@@ -37298,7 +37313,7 @@ msgstr ""
msgid "When an event in GitLab triggers a webhook, you can use the request details to figure out if something went wrong."
msgstr ""
msgid "When disabled, an external authentication provider must be used."
msgid "When inactive, an external authentication provider must be used."
msgstr ""
msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks."
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7