diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-20 13:09:10 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-20 13:09:10 +0000 |
| commit | a85220506eb3a7516008a1ffe67beff9550cdd1c (patch) | |
| tree | 53231d9351e2aade017fc83edfdca5826eda74a7 | |
| parent | ca7e746b44acc897c6beb3bc5c7071c24efd0692 (diff) | |
| parent | 3cc334eae5abf65b0ecb4159e4e9712dab81c33c (diff) | |
| download | gitlab-ce-a85220506eb3a7516008a1ffe67beff9550cdd1c.tar.gz | |
Merge branch '25678-remove-user-build' into 'master'
Remove unnecessary method `build_user` from model `User`
Closes #25678
See merge request !8162
| -rw-r--r-- | app/models/user.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/25678-remove-user-build.yml | 4 | ||||
| -rw-r--r-- | lib/api/users.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 3a17c98eff6..d771eaff472 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -311,10 +311,6 @@ class User < ActiveRecord::Base find_by(id: Key.unscoped.select(:user_id).where(id: key_id)) end - def build_user(attrs = {}) - User.new(attrs) - end - def reference_prefix '@' end diff --git a/changelogs/unreleased/25678-remove-user-build.yml b/changelogs/unreleased/25678-remove-user-build.yml new file mode 100644 index 00000000000..873e637d670 --- /dev/null +++ b/changelogs/unreleased/25678-remove-user-build.yml @@ -0,0 +1,4 @@ +--- +title: remove build_user +merge_request: 8162 +author: Arsenev Vladislav diff --git a/lib/api/users.rb b/lib/api/users.rb index 0842c3874c5..4c22287b5c6 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -94,7 +94,7 @@ module API identity_attrs = params.slice(:provider, :extern_uid) 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 if identity_attrs.any? |