CE Upstream - Wednesday

Resolved conflicts:

UU .rubocop_todo.yml
UU CHANGELOG.md
UU app/assets/javascripts/api.js
UU app/controllers/projects/wikis_controller.rb
UU db/schema.rb
UU doc/api/projects.md
UU spec/lib/gitlab/regex_spec.rb
UU spec/services/todo_service_spec.rb