Merge branch 'feature-flag-permissions-protected-environments' into 'master'

Alert Users that Protected Environments affects Feature Flags

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

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

 .deploy_access_levels-container
-  = dropdown_tag(s_('ProtectedEnvironment|Choose who is allowed to deploy'),
+  = dropdown_tag(s_('ProtectedEnvironment|Select users'),
     options: { toggle_class: 'js-allowed-to-deploy wide js-multiselect',
     dropdown_class: 'dropdown-menu-user dropdown-menu-selectable',
     filter: true,

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

@@ -13,6 +13,9 @@
       .form-group
         = f.label :deploy_access_levels_attributes, class: 'label-bold' do
           = s_('ProtectedEnvironment|Allowed to deploy')
+        - if Feature.enabled?(:feature_flag_permissions, @project)
+          .text-muted.mb-2
+            = s_('ProtectedEnvironment|Select users to deploy and manage Feature Flag settings')
         = render partial: 'projects/protected_environments/deploy_access_levels_dropdown', locals: { f: f }
 
     .card-footer

ee/app/views/projects/settings/ci_cd/_protected_environments.html.haml

@@ -9,7 +9,7 @@
       %button.btn.js-settings-toggle{ type: 'button' }
         = expanded ? _('Collapse') : _('Expand')
       %p
-        = s_('ProtectedEnvironment|Protect Environments in order to restrict who can execute deployments.')
+        = s_('ProtectedEnvironment|Protecting an environment restricts the users who can execute deployments.')
     .settings-content
       = render 'projects/protected_environments/form'
 

ee/changelogs/unreleased/feature-flag-permissions-protected-environments.yml

+---
+title: Alert users that protected environments affects feature flags
+merge_request: 12168
+author:
+type: added

locale/gitlab.pot

@@ -9970,27 +9970,30 @@ msgstr ""
 msgid "ProtectedEnvironment|Allowed to deploy"
 msgstr ""
 
-msgid "ProtectedEnvironment|Choose who is allowed to deploy"
-msgstr ""
-
 msgid "ProtectedEnvironment|Environment"
 msgstr ""
 
 msgid "ProtectedEnvironment|Protect"
 msgstr ""
 
-msgid "ProtectedEnvironment|Protect Environments in order to restrict who can execute deployments."
-msgstr ""
-
 msgid "ProtectedEnvironment|Protect an environment"
 msgstr ""
 
 msgid "ProtectedEnvironment|Protected Environment (%{protected_environments_count})"
 msgstr ""
 
+msgid "ProtectedEnvironment|Protecting an environment restricts the users who can execute deployments."
+msgstr ""
+
 msgid "ProtectedEnvironment|Select an environment"
 msgstr ""
 
+msgid "ProtectedEnvironment|Select users"
+msgstr ""
+
+msgid "ProtectedEnvironment|Select users to deploy and manage Feature Flag settings"
+msgstr ""
+
 msgid "ProtectedEnvironment|There are currently no protected environments, protect an environment with the form above."
 msgstr ""