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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
57a3f284
Commit
57a3f284
authored
Jun 03, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added minimum password length to password field
Closes #17765
parent
3f4ac2ff
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+1
-0
app/views/devise/shared/_signup_box.html.haml
app/views/devise/shared/_signup_box.html.haml
+1
-1
No files found.
app/controllers/sessions_controller.rb
View file @
57a3f284
...
@@ -14,6 +14,7 @@ class SessionsController < Devise::SessionsController
...
@@ -14,6 +14,7 @@ class SessionsController < Devise::SessionsController
before_action
:load_recaptcha
before_action
:load_recaptcha
def
new
def
new
set_minimum_password_length
if
Gitlab
.
config
.
ldap
.
enabled
if
Gitlab
.
config
.
ldap
.
enabled
@ldap_servers
=
Gitlab
::
LDAP
::
Config
.
servers
@ldap_servers
=
Gitlab
::
LDAP
::
Config
.
servers
else
else
...
...
app/views/devise/shared/_signup_box.html.haml
View file @
57a3f284
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
%div
%div
=
f
.
email_field
:email
,
class:
"form-control middle"
,
placeholder:
"Email"
,
required:
true
=
f
.
email_field
:email
,
class:
"form-control middle"
,
placeholder:
"Email"
,
required:
true
.form-group.append-bottom-20
#password-strength
.form-group.append-bottom-20
#password-strength
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
placeholder:
"Password
"
,
required:
true
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
placeholder:
"Password
- minimum length
#{
@minimum_password_length
}
characters"
,
required:
true
,
pattern:
".{
#{
@minimum_password_length
}
,}"
,
title:
"Minimum length is
#{
@minimum_password_length
}
characters"
%div
%div
-
if
current_application_settings
.
recaptcha_enabled
-
if
current_application_settings
.
recaptcha_enabled
=
recaptcha_tags
=
recaptcha_tags
...
...
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