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
0c8e7f49
Commit
0c8e7f49
authored
Jun 20, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add missing user updates
parent
831b2fcc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
user.rb
app/models/user.rb
+4
-3
No files found.
app/models/user.rb
View file @
0c8e7f49
...
...
@@ -53,7 +53,7 @@ class User < ActiveRecord::Base
lease
=
Gitlab
::
ExclusiveLease
.
new
(
"user_update_tracked_fields:
#{
id
}
"
,
timeout:
1
.
hour
.
to_i
)
return
unless
lease
.
try_obtain
sav
e
(
validate:
false
)
Users
::
UpdateService
.
new
(
self
,
self
).
execut
e
(
validate:
false
)
end
attr_accessor
:force_random_password
...
...
@@ -965,7 +965,7 @@ class User < ActiveRecord::Base
if
attempts_exceeded?
lock_access!
unless
access_locked?
else
sav
e
(
validate:
false
)
Users
::
UpdateService
.
new
(
self
,
self
).
execut
e
(
validate:
false
)
end
end
...
...
@@ -1123,7 +1123,8 @@ class User < ActiveRecord::Base
email:
email
,
&
creation_block
)
user
.
save
(
validate:
false
)
Users
::
UpdateService
.
new
(
user
,
user
).
execute
(
validate:
false
)
user
ensure
Gitlab
::
ExclusiveLease
.
cancel
(
lease_key
,
uuid
)
...
...
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