Merge branch 'ee-7204-follow-up-protected-environments-technical-debt-ce' into 'master'

Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545

See merge request gitlab-org/gitlab-ee!7283

app/presenters/commit_status_presenter.rb

@@ -11,6 +11,7 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
   }.freeze
 
   private_constant :CALLOUT_FAILURE_MESSAGES
+
   presents :build
 
   prepend ::EE::CommitStatusPresenter

lib/gitlab/ci/status/build/failed.rb

@@ -14,6 +14,7 @@ module Gitlab
           }.freeze
 
           private_constant :REASONS
+
           prepend ::EE::Gitlab::Ci::Status::Build::Failed
 
           def status_tooltip