Ce to ee

James Lopezrequested to merge
ce-to-ee into master

Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee

Conflicts:

spec/models/project_spec.rb

Merge request reports