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
Léo-Paul Géneau
gitlab-ce
Commits
3cc334ea
Commit
3cc334ea
authored
Dec 18, 2016
by
Arsenev Vladislav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove build_user from model User
parent
546fa165
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/models/user.rb
app/models/user.rb
+0
-4
changelogs/unreleased/25678-remove-user-build.yml
changelogs/unreleased/25678-remove-user-build.yml
+4
-0
lib/api/users.rb
lib/api/users.rb
+1
-1
No files found.
app/models/user.rb
View file @
3cc334ea
...
@@ -311,10 +311,6 @@ class User < ActiveRecord::Base
...
@@ -311,10 +311,6 @@ class User < ActiveRecord::Base
find_by
(
id:
Key
.
unscoped
.
select
(
:user_id
).
where
(
id:
key_id
))
find_by
(
id:
Key
.
unscoped
.
select
(
:user_id
).
where
(
id:
key_id
))
end
end
def
build_user
(
attrs
=
{})
User
.
new
(
attrs
)
end
def
reference_prefix
def
reference_prefix
'@'
'@'
end
end
...
...
changelogs/unreleased/25678-remove-user-build.yml
0 → 100644
View file @
3cc334ea
---
title
:
remove build_user
merge_request
:
8162
author
:
Arsenev Vladislav
lib/api/users.rb
View file @
3cc334ea
...
@@ -94,7 +94,7 @@ module API
...
@@ -94,7 +94,7 @@ module API
identity_attrs
=
params
.
slice
(
:provider
,
:extern_uid
)
identity_attrs
=
params
.
slice
(
:provider
,
:extern_uid
)
confirm
=
params
.
delete
(
:confirm
)
confirm
=
params
.
delete
(
:confirm
)
user
=
User
.
build_user
(
declared_params
(
include_missing:
false
))
user
=
User
.
new
(
declared_params
(
include_missing:
false
))
user
.
skip_confirmation!
unless
confirm
user
.
skip_confirmation!
unless
confirm
if
identity_attrs
.
any?
if
identity_attrs
.
any?
...
...
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