CE upstream to EE master (Tue)
based on https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1623
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: doc/api/issues.md
both modified: lib/api/helpers/internal_helpers.rb
both modified: yarn.lock
both modified: doc/api/issues.md
both modified: lib/api/helpers/internal_helpers.rb