Fix OAuth/SAML user blocking behavior

lib/gitlab/o_auth/user.rb

@@ -29,9 +29,11 @@ module Gitlab
       def save(provider = 'OAuth')
         unauthorized_to_create unless gl_user
 
+        block_after_save = needs_blocking?
+
         gl_user.save!
 
-        gl_user.block if needs_blocking?
+        gl_user.block if block_after_save
 
         log.info "(#{provider}) saving user #{auth_hash.email} from login with extern_uid => #{auth_hash.uid}"
         gl_user