diff options
Diffstat (limited to 'doc/user/profile')
| -rw-r--r-- | doc/user/profile/account/index.md | 3 | ||||
| -rw-r--r-- | doc/user/profile/active_sessions.md | 2 | ||||
| -rw-r--r-- | doc/user/profile/index.md | 41 | ||||
| -rw-r--r-- | doc/user/profile/preferences.md | 6 |
4 files changed, 45 insertions, 7 deletions
diff --git a/doc/user/profile/account/index.md b/doc/user/profile/account/index.md index 56b6498e16c..b10cc778f45 100644 --- a/doc/user/profile/account/index.md +++ b/doc/user/profile/account/index.md @@ -3,3 +3,6 @@ redirect_to: '../index.md#profile-settings' --- This document was moved to [../index.md#profile-settings](../index.md#profile-settings). + +<!-- This redirect file can be deleted after February 1, 2021. --> +<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> diff --git a/doc/user/profile/active_sessions.md b/doc/user/profile/active_sessions.md index 4630215eca6..c35ab05bbec 100644 --- a/doc/user/profile/active_sessions.md +++ b/doc/user/profile/active_sessions.md @@ -34,7 +34,7 @@ exceeds 100, the oldest ones are deleted. NOTE: **Note:** When any session is revoked all **Remember me** tokens for all -devices will be revoked. See ['Why do I keep getting signed out?'](index.md#why-do-i-keep-getting-signed-out) +devices are revoked. See ['Why do I keep getting signed out?'](index.md#why-do-i-keep-getting-signed-out) for more information about the **Remember me** feature. <!-- ## Troubleshooting diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index 8ae92a42581..37623c94eda 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -188,15 +188,12 @@ To set your current status: 1. Set the desired emoji and/or status message. 1. Click **Set status**. Alternatively, you can click **Remove status** to remove your user status entirely. - - or 1. Click your avatar. 1. Select **Profile**. 1. Click **Edit profile** (pencil icon). 1. Enter your status message in the **Your status** text field. - 1. Alternatively, select the **Busy** checkbox ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/259649) in GitLab 13.6}. 1. Click **Add status emoji** (smiley face), and select the desired emoji. 1. Click **Update profile settings**. @@ -204,6 +201,44 @@ You can also set your current status [using the API](../../api/users.md#user-sta If you previously selected the "Busy" checkbox, remember to deselect it when you become available again. +## Busy status indicator + +> - Introduced in GitLab 13.6. +> - It's [deployed behind a feature flag](../feature_flags.md), disabled by default. +> - It's disabled on GitLab.com. +> - It's not recommended for production use. +> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-busy-status-feature). + +To indicate to others that you are busy, you can set an indicator + + + +To set the busy status indicator, either: + +- Set it directly: + + 1. Click your avatar. + 1. Click **Set status**, or **Edit status** if you have already set a status. + 1. Select the **Busy** checkbox + +- Set it on your profile: + + 1. Click your avatar. + 1. Select **Profile**. + 1. Click **Edit profile** (**{pencil}**). + 1. Select the **Busy** checkbox + +### Enable busy status feature + +The busy status feature is deployed behind a feature flag and is **disabled by default**. +[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) can enable it for your instance from the [rails console](../../administration/feature_flags.md#start-the-gitlab-rails-console). + +To enable it: + +```ruby +Feature.enable(:set_user_availability_status) +``` + ## Commit email > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/21598) in GitLab 11.4. diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index 168bcb5a42e..511ec1fecb0 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -107,8 +107,8 @@ While `1280px` is the standard max width when using fixed layout, some pages sti For users who have access to a large number of projects but only keep up with a select few, the amount of activity on the default Dashboard page can be -overwhelming. Changing this setting allows you to redefine what your default -dashboard will be. +overwhelming. Changing this setting allows you to redefine your default +dashboard. You have 8 options here that you can use for your default dashboard view: @@ -164,7 +164,7 @@ You can choose one of the following options as the first day of the week: - Sunday - Monday -If you select **System Default**, the system-wide default setting will be used. +If you select **System Default**, the system-wide default setting is used. ## Integrations |