BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5ab18562
Commit
5ab18562
authored
Jun 27, 2012
by
Jakub Troszok
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing requests tests.
parent
4426bc18
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
user.rb
app/models/user.rb
+1
-1
_form.html.haml
app/views/admin/users/_form.html.haml
+1
-1
No files found.
app/models/user.rb
View file @
5ab18562
...
@@ -59,7 +59,7 @@ class User < ActiveRecord::Base
...
@@ -59,7 +59,7 @@ class User < ActiveRecord::Base
before_validation
:generate_password
,
:on
=>
:create
before_validation
:generate_password
,
:on
=>
:create
def
generate_password
def
generate_password
if
self
.
force_random_password
==
true
if
self
.
force_random_password
self
.
password
=
self
.
password_confirmation
=
Devise
.
friendly_token
.
first
(
8
)
self
.
password
=
self
.
password_confirmation
=
Devise
.
friendly_token
.
first
(
8
)
end
end
end
end
...
...
app/views/admin/users/_form.html.haml
View file @
5ab18562
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
-
if
f
.
object
.
new_record?
-
if
f
.
object
.
new_record?
.clearfix
.clearfix
=
f
.
label
:admin
,
:class
=>
"checkbox"
do
=
f
.
label
:admin
,
:class
=>
"checkbox"
do
=
f
.
check_box
:force_random_password
=
f
.
check_box
:force_random_password
,
{},
true
,
nil
%span
Generate random password
%span
Generate random password
%div
.password-fields
%div
.password-fields
...
...
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