Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-16
# Conflicts: # app/models/project.rb # db/schema.rb # locale/gitlab.pot [ci skip]
Showing

This diff is collapsed.
# Conflicts: # app/models/project.rb # db/schema.rb # locale/gitlab.pot [ci skip]
657 KB | W: | H:
238 KB | W: | H: