diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-15 16:50:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-15 16:50:00 +0000 |
| commit | e5df66e1af47ea9bbd526657f9af913618e6f3ee (patch) | |
| tree | 72a433ad350510d1c7c82b586e181cb9b7c9cc73 | |
| parent | 15b63e15eda5f69d0f918d8df44bf614a14b3cda (diff) | |
| parent | a7ac45809f1f3ccaa1a2b124f2532d8684931c6c (diff) | |
| download | gitlab-ce-e5df66e1af47ea9bbd526657f9af913618e6f3ee.tar.gz | |
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 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 |