Fix cherry-picking or reverting through an MR (!9640) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Douwe Maan requested to merge dm-fix-cherry-pick into master Mar 01, 2017

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/28711 and https://gitlab.com/gitlab-org/gitlab-ce/issues/28426

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9323, to be as minimal as possible while still fixing the issue. That MR will include more refactoring of our commit and file services.