Merge branch '7175-protected-environments-use-limited-count-approach-ee' into 'master'

Resolve "Follow up - Protected Environments: Use limited count approach"

Closes #7175

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

ee/app/controllers/ee/projects/settings/ci_cd_controller.rb

@@ -26,7 +26,6 @@ module EE
 
         def define_protected_env_variables
           @protected_environments = @project.protected_environments.order(:name)
-          @protected_environments_count = @protected_environments.count
           @protected_environment = @project.protected_environments.new
         end
 

ee/app/views/projects/protected_environments/_environments_list.html.haml

@@ -11,7 +11,7 @@
           %col{ width: '10%' }
       %thead
         %tr
-          %th= s_('ProtectedEnvironment|Protected Environment (%{protected_environments_count})') % { protected_environments_count: @protected_environments_count }
+          %th= s_('ProtectedEnvironment|Protected Environment (%{protected_environments_count})') % { protected_environments_count: limited_counter_with_delimiter(@protected_environments) }
           %th= s_('ProtectedEnvironment|Allowed to deploy')
           - if can_admin_project
             %th

ee/changelogs/unreleased/7175-protected-environments-use-limited-count-approach-ee.yml

+---
+title: Use limited count approach on Protected Environments view
+merge_request: 6987
+author:
+type: performance