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

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
e5df66e1 · Douwe Maan · 15b63e15 · a7ac4580 · e5df66e1
Commit e5df66e1 authored Feb 15, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/o_auth/user.rb lib/gitlab/o_auth/user.rb +1 -1

No files found.
--- 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