CE to EE merge conflicts for 9-3-stable
These are the conflicts that occurred while merging 9-3-stable into 9-3-stable-ee, please resolve and push your changes into this MR (Don't force push!)
-
app/models/user.rb: @yorickpeterse Please resolve. -
db/schema.rb: @yorickpeterse Please resolve -
spec/controllers/autocomplete_controller_spec.rb: @rymai Please resolve.
Edited by yorickpeterse-staging