Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-02
# Conflicts: # doc/administration/incoming_email.md # doc/administration/index.md # doc/api/merge_requests.md # doc/user/project/issues/create_new_issue.md # ee/app/assets/javascripts/protected_branches/index.js [ci skip]
Showing
Please register or sign in to comment