diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-15 19:50:00 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-15 19:53:38 +0300 |
| commit | b197a3d4da005482db833344e194e3ccf1a19f7a (patch) | |
| tree | a0c815b76c4c95591a7d741f591e3230d1911825 | |
| parent | fdd986b525d91212f14f35822427cab326b12446 (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
| -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 8a7a691736d..e694be45c9f 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 |