deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing requests tests.

Browse source
This commit is contained in:
Jakub Troszok 2012-06-27 00:55:54 +02:00
parent 4426bc1844
commit 5ab1856291
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -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

2
app/views/admin/users/_form.html.haml
View file

@ -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