Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545 (!7283) · Merge requests · GitLab.org / GitLab · GitLab

Mayra Cabrera requested to merge ee-7204-follow-up-protected-environments-technical-debt-ce into master Sep 07, 2018

What does this MR do?

Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545/commits so it can be cleanly applied.

Edited Feb 08, 2024 by 🤖 GitLab Bot 🤖