diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-15 19:50:00 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-19 14:13:40 +0300 |
| commit | 2ba56f9ac1ba64eb516c8c573d747a3d787578ad (patch) | |
| tree | d2cd5fff0e01155472d34f6e9ff47c4cc54978ee /lib | |
| parent | df81934fb0e8e6c8a959cfa3b11bc8f48774eb7e (diff) | |
Merge branch 'fj-fixed-bug-17054' into 'master'
Fixed bug with the user synced attributes when the user doesn't exist
See merge request gitlab-org/gitlab-ce!17152
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/o_auth/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index ed5ab7b174d..28ebac1776e 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -224,7 +224,7 @@ module Gitlab end def clear_user_synced_attributes_metadata - gl_user.user_synced_attributes_metadata&.destroy + gl_user&.user_synced_attributes_metadata&.destroy end def log |