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'
2ba56f9a · Douwe Maan · Mark Fletcher · df81934f · 2ba56f9a
Commit 2ba56f9a authored Feb 15, 2018 by Douwe Maan Committed by Mark Fletcher Feb 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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