Merge branch 'ee-unify-ci-variables-form-row' into 'master'

Unify app/views/ci/variables/_variable_row.html.haml

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

app/views/ci/variables/_variable_row.html.haml

@@ -43,8 +43,6 @@
           %span.toggle-icon
             = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
             = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
-      -# EE-specific start
-      = render 'ci/variables/environment_scope', form_field: form_field, variable: variable
-      -# EE-specific end
+      = render_if_exists 'ci/variables/environment_scope', form_field: form_field, variable: variable
   %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
     = icon('minus-circle')