Merge branch 'rename-strategy-names-fe' into 'master'

Rename Strategies to Focus on Affected Users

See merge request gitlab-org/gitlab!36833

doc/operations/feature_flags.md

@@ -61,7 +61,7 @@ for. The rollout strategy will have no effect if the environment spec is disable
 It can be set to:
 
 - All users
-- [Percent rollout (logged in users)](#percent-rollout-logged-in-users)
+- [Percent of users](#percent-of-users)
   - Optionally, you can click the **Include additional user IDs** checkbox and add a list
     of specific users IDs to enable the feature for.
 - [User IDs](#user-ids)
@@ -82,9 +82,9 @@ for granular feature flag controls. GitLab Feature Flags can have multiple strat
 and the supported strategies are:
 
 - [All users](#all-users)
-- [Percent rollout (logged in users)](#percent-rollout-logged-in-users)
+- [Percent of Users](#percent-of-users)
 - [User IDs](#user-ids)
-- [List](#list)
+- [User List](#user-list)
 
 Strategies can be added to feature flags when [creating a feature flag](#create-a-feature-flag),
 or by editing an existing feature flag after creation by navigating to **Operations > Feature Flags**
@@ -95,7 +95,7 @@ and clicking **{pencil}** (edit).
 Enables the feature for all users. It uses the [`default`](https://unleash.github.io/docs/activation_strategy#default)
 Unleash activation strategy.
 
-### Percent rollout (logged in users)
+### Percent of Users
 
 Enables the feature for a percentage of authenticated users. It uses the
 [`gradualRolloutUserId`](https://unleash.github.io/docs/activation_strategy#gradualrolloutuserid)
@@ -130,7 +130,7 @@ CAUTION: **Caution:**
 The Unleash client **must** be given a user ID for the feature to be enabled for
 target users. See the [Ruby example](#ruby-application-example) below.
 
-### List
+### User List
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35930) in GitLab 13.1.
 
@@ -165,6 +165,7 @@ to disable a feature flag for a specific environment:
 1. Navigate to your project's **Operations > Feature Flags**.
 1. For the feature flag you want to disable, click the Pencil icon.
 1. To disable the flag:
+
    - In GitLab 13.0 and earlier: Slide the Status toggle for the environment. Or, to delete the
      environment spec, on the right, click the **Remove (X)** icon.
    - In GitLab 13.1 and later: For each strategy it applies to, under **Environments**, delete the environment.

ee/app/assets/javascripts/feature_flags/components/strategy.vue

@@ -98,7 +98,7 @@ export default {
         },
         {
           value: ROLLOUT_STRATEGY_PERCENT_ROLLOUT,
-          text: __('Percent rollout (logged in users)'),
+          text: __('Percent of users'),
         },
         {
           value: ROLLOUT_STRATEGY_USER_ID,
@@ -106,7 +106,7 @@ export default {
         },
         {
           value: ROLLOUT_STRATEGY_GITLAB_USER_LIST,
-          text: __('List'),
+          text: __('User List'),
         },
       ],
     };

ee/changelogs/unreleased/rename-strategy-names-fe.yml

+---
+title: Rename Strategies to Focus on Affected Users
+merge_request: 36833
+author:
+type: changed

ee/spec/features/projects/feature_flags/user_creates_feature_flag_spec.rb

@@ -57,14 +57,14 @@ RSpec.describe 'User creates feature flag', :js do
       select 'All users', from: 'Type'
     end
     within_strategy_row(2) do
-      select 'Percent rollout (logged in users)', from: 'Type'
+      select 'Percent of users', from: 'Type'
     end
     within_strategy_row(1) do
       delete_strategy_button.click
     end
 
     within_strategy_row(1) do
-      expect(page).to have_select('Type', selected: 'Percent rollout (logged in users)')
+      expect(page).to have_select('Type', selected: 'Percent of users')
     end
   end
 

ee/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe 'User updates feature flag', :js do
 
       click_button 'Add strategy'
       within_strategy_row(2) do
-        select 'Percent rollout (logged in users)', from: 'Type'
+        select 'Percent of users', from: 'Type'
         fill_in 'Percentage', with: '15'
       end
       click_button 'Save changes'
@@ -49,7 +49,7 @@ RSpec.describe 'User updates feature flag', :js do
         expect(page).to have_text 'All environments'
       end
       within_strategy_row(2) do
-        expect(page).to have_text 'Percent rollout (logged in users)'
+        expect(page).to have_text 'Percent of users'
         expect(page).to have_field 'Percentage', with: '15'
         expect(page).to have_text 'All environments'
       end

locale/gitlab.pot

@@ -16707,7 +16707,7 @@ msgstr ""
 msgid "People without permission will never get a notification."
 msgstr ""
 
-msgid "Percent rollout (logged in users)"
+msgid "Percent of users"
 msgstr ""
 
 msgid "Percentage"
@@ -25502,6 +25502,9 @@ msgstr ""
 msgid "User IDs"
 msgstr ""
 
+msgid "User List"
+msgstr ""
+
 msgid "User Lists can only be created and modified with %{linkStart}the API%{linkEnd}"
 msgstr ""