• Carlos Tadeu Panato Junior's avatar
    Relese5.0 merge master 20180608 (#8933) · 3bae6748
    Carlos Tadeu Panato Junior authored
    * Add missing diagnostics (#8911)
    
    * Update diagnostics.go
    
    * Update diagnostics.go
    
    * Fix push notification styling backwards compatibility (#8913)
    
    * MM-10803: remove premature user sanitization on deactivation (#8926)
    
    * remove unused UpdateNonSSOUserActive
    
    * MM-10803: stop prematurely sanitizing users on deactivate
    
    This change was preceded by the removal of UpdateNonSSOUserActive to
    ensure there are no APIs relying on the sanitized return value.
    
    * MM-10803: test websocket events after UpdateUserActive
    
    * MM-10264: Adds system scheme to permissions import/export. (#8924)
    
    * MM-10264: Adds system scheme to permissions import/export.
    
    * MM-10264: Switches to more likely unique name.
    
    * MM-10264: Changed collision prevention string.
    
    * MM-10264: Rolls back created schemes in all error cases.
    
    * MM-10264: Test fix for more rollback cases.
    3bae6748