diff options
author | Sean McGivern <sean@gitlab.com> | 2018-07-09 17:23:30 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2018-07-09 17:23:30 +0100 |
commit | 2a4039cf668c23156d49eae7f84837fb527f2549 (patch) | |
tree | 7add56decfeff4220bce9a840f700bffd98f395c /lib/api/users.rb | |
parent | ab3c91a702a6a38374d574488ba4841758842505 (diff) | |
parent | 72c99b58abe7bbc956804c9d403689e64f579d3e (diff) | |
download | gitlab-ce-2a4039cf668c23156d49eae7f84837fb527f2549.tar.gz |
Merge branch 'update-rubocop'
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index e8df2c5a74a..5aaaf104dff 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -186,7 +186,7 @@ module API identity = user.identities.find_by(provider: identity_attrs[:provider]) if identity - identity.update_attributes(identity_attrs) + identity.update(identity_attrs) else identity = user.identities.build(identity_attrs) identity.save |