Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 1 deletions

diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index f1eafc2a95a..3adf5248b8d 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -196,7 +196,22 @@ enabled for only the `gitlab` project. The project is passed by supplying a
 /chatops run feature set --project=gitlab-org/gitlab some_feature true
 ```
 
-For groups the `--group` flag is available:
+You can use the `--user` option to enable a feature flag for a specific user:
+
+```shell
+/chatops run feature set --user=myusername some_feature true
+```
+
+If you would like to gather feedback internally first,
+feature flags scoped to a user can also be enabled
+for GitLab team members with the `gitlab_team_members`
+[feature group](index.md#feature-groups):
+
+```shell
+/chatops run feature set --feature-group=gitlab_team_members some_feature true
+```
+
+You can use the `--group` flag to enable a feature flag for a specific group:
 
 ```shell
 /chatops run feature set --group=gitlab-org some_feature true
diff --git a/doc/development/feature_flags/index.md b/doc/development/feature_flags/index.md
index 8f5c19efd94..7370697b082 100644
--- a/doc/development/feature_flags/index.md
+++ b/doc/development/feature_flags/index.md
@@ -459,6 +459,18 @@ dynamic (querying the DB, for example).
 Once defined in `lib/feature.rb`, you can to activate a
 feature for a given feature group via the [`feature_group` parameter of the features API](../../api/features.md#set-or-create-a-feature)
 
+The available feature groups are:
+
+| Group name            | Scoped to | Description |
+| --------------------- | --------- | ----------- |
+| `gitlab_team_members` | Users     | Enables the feature for users who are members of [`gitlab-com`](https://gitlab.com/gitlab-com) |
+
+Feature groups can be enabled via the group name:
+
+```ruby
+Feature.enable(:feature_flag_name, :gitlab_team_members)
+```
+
 ### Enabling a feature flag locally (in development)
 
 In the rails console (`rails c`), enter the following command to enable a feature flag: