Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9a1f8721
Commit
9a1f8721
authored
Mar 02, 2022
by
Russell Dickenson
Committed by
Ezekiel Kigbo
Mar 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UI text of sign-in restrictions
Changelog: changed
parent
2b6c52ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
app/views/admin/application_settings/_signin.html.haml
app/views/admin/application_settings/_signin.html.haml
+4
-4
locale/gitlab.pot
locale/gitlab.pot
+9
-3
No files found.
app/views/admin/application_settings/_signin.html.haml
View file @
9a1f8721
...
...
@@ -8,17 +8,17 @@
=
f
.
label
:password_authentication_enabled_for_web
,
class:
'form-check-label'
do
=
_
(
'Allow password authentication for the web interface'
)
.form-text.text-muted
=
_
(
'
When inactive, an external authentication provider must be use
d.'
)
=
_
(
'
Clear this checkbox to use an external authentication provider instea
d.'
)
.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
=
_
(
'Allow password authentication for Git over HTTP(S)'
)
.form-text.text-muted
When inactive, a Personal Access Token
-
if
Gitlab
::
Auth
::
Ldap
::
Config
.
enabled?
or LDAP password
must be used to authenticate.
=
_
(
'Clear this checkbox to use a personal access token or LDAP password instead.'
)
-
else
=
_
(
'Clear this checkbox to use a personal access token instead.'
)
-
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 authentication sources'
)
...
...
locale/gitlab.pot
View file @
9a1f8721
...
...
@@ -7456,6 +7456,15 @@ msgstr ""
msgid "Clear templates search input"
msgstr ""
msgid "Clear this checkbox to use a personal access token instead."
msgstr ""
msgid "Clear this checkbox to use a personal access token or LDAP password instead."
msgstr ""
msgid "Clear this checkbox to use an external authentication provider instead."
msgstr ""
msgid "Clear weight"
msgstr ""
...
...
@@ -41347,9 +41356,6 @@ msgstr ""
msgid "When enabled, job logs are collected by Datadog and displayed along with pipeline execution traces."
msgstr ""
msgid "When inactive, an external authentication provider must be used."
msgstr ""
msgid "When merge requests and commits in the default branch close, any issues they reference also close."
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment