diff options
Diffstat (limited to 'doc/user/profile')
| -rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 14 | ||||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_note_header_v13_9.png | bin | 0 -> 24006 bytes | |||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_notes_v13_9.png | bin | 0 -> 41947 bytes | |||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_profile_page_v13_6.png | bin | 0 -> 25119 bytes | |||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_settings_menu_v13_6.png | bin | 0 -> 26843 bytes | |||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png | bin | 0 -> 6190 bytes | |||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_sidebar_v13_9.png | bin | 0 -> 21914 bytes | |||
| -rw-r--r-- | doc/user/profile/img/busy_indicator_user_popovers_v13_6.png | bin | 0 -> 32158 bytes | |||
| -rw-r--r-- | doc/user/profile/index.md | 26 | ||||
| -rw-r--r-- | doc/user/profile/notifications.md | 3 | ||||
| -rw-r--r-- | doc/user/profile/personal_access_tokens.md | 2 | ||||
| -rw-r--r-- | doc/user/profile/preferences.md | 11 |
12 files changed, 37 insertions, 19 deletions
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index 44bf97bdd42..69efe455c53 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -49,11 +49,13 @@ To enable 2FA: 1. Select **Enable Two-factor Authentication**. 1. **On your device (usually your phone):** 1. Install a compatible application, like: - - [Authenticator](https://mattrubin.me/authenticator/): open source app for iOS devices. - - [andOTP](https://github.com/andOTP/andOTP): feature rich open source app for Android which supports PGP encrypted backups. - - [FreeOTP](https://freeotp.github.io/): open source app for Android. - - [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en): proprietary app for iOS and Android. - - [SailOTP](https://openrepos.net/content/seiichiro0185/sailotp): open source app for SailFish OS. + - [Authy](https://authy.com/) + - [Duo Mobile](https://duo.com/product/multi-factor-authentication-mfa/duo-mobile-app) + - [LastPass](https://lastpass.com/auth/) + - [Authenticator](https://mattrubin.me/authenticator/) + - [andOTP](https://github.com/andOTP/andOTP) + - [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en) + - [SailOTP](https://openrepos.net/content/seiichiro0185/sailotp) 1. In the application, add a new entry in one of two ways: - Scan the code presented in GitLab with your device's camera to add the entry automatically. @@ -159,7 +161,7 @@ have FortiToken configured in FortiToken Cloud. You'll also need a `client_id` and `client_secret` to configure FortiToken Cloud. To get these, see the `REST API Guide` at -[`Fortinet Document Library`](https://docs.fortinet.com/document/fortitoken-cloud/20.4.d/rest-api). +[`Fortinet Document Library`](https://docs.fortinet.com/document/fortitoken-cloud/latest/rest-api). First configure FortiToken Cloud in GitLab. On your GitLab server: diff --git a/doc/user/profile/img/busy_indicator_note_header_v13_9.png b/doc/user/profile/img/busy_indicator_note_header_v13_9.png Binary files differnew file mode 100644 index 00000000000..63301ebdc14 --- /dev/null +++ b/doc/user/profile/img/busy_indicator_note_header_v13_9.png diff --git a/doc/user/profile/img/busy_indicator_notes_v13_9.png b/doc/user/profile/img/busy_indicator_notes_v13_9.png Binary files differnew file mode 100644 index 00000000000..2efe075c72b --- /dev/null +++ b/doc/user/profile/img/busy_indicator_notes_v13_9.png diff --git a/doc/user/profile/img/busy_indicator_profile_page_v13_6.png b/doc/user/profile/img/busy_indicator_profile_page_v13_6.png Binary files differnew file mode 100644 index 00000000000..c8e969f38db --- /dev/null +++ b/doc/user/profile/img/busy_indicator_profile_page_v13_6.png diff --git a/doc/user/profile/img/busy_indicator_settings_menu_v13_6.png b/doc/user/profile/img/busy_indicator_settings_menu_v13_6.png Binary files differnew file mode 100644 index 00000000000..711638541dd --- /dev/null +++ b/doc/user/profile/img/busy_indicator_settings_menu_v13_6.png diff --git a/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png b/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png Binary files differnew file mode 100644 index 00000000000..3dca88ec8cc --- /dev/null +++ b/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png diff --git a/doc/user/profile/img/busy_indicator_sidebar_v13_9.png b/doc/user/profile/img/busy_indicator_sidebar_v13_9.png Binary files differnew file mode 100644 index 00000000000..83024b319bf --- /dev/null +++ b/doc/user/profile/img/busy_indicator_sidebar_v13_9.png diff --git a/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png b/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png Binary files differnew file mode 100644 index 00000000000..16fb0e6556b --- /dev/null +++ b/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index d2cbf9e4acd..65d83c2b413 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -40,9 +40,9 @@ On your profile page, you can see the following information: - Contributed projects: [projects](../project/index.md) you contributed to - Personal projects: your personal projects (respecting the project's visibility level) - Starred projects: projects you starred -- Snippets: your personal code [snippets](../snippets.md#personal-snippets) -- Followers: people following you -- Following: people you are following +- Snippets: your personal code [snippets](../snippets.md) +- Followers: people [following](../index.md#user-activity) you +- Following: people you are [following](../index.md#user-activity) Profile page with active Following view: @@ -233,6 +233,26 @@ To set the busy status indicator, either: 1. Select **Edit profile**. 1. Select the **Busy** checkbox. + Once selected, you can see the busy status in various locations in the user interface. + + Username: + + | Profile page | Settings menu | User popovers | + | --- | --- | --- | + |  |  |  | + + Issue and merge request sidebar: + + | Sidebar| Collapsed sidebar | + | --- | --- | + |  |  | + + Notes: + + | Notes | Note headers | + | --- | --- | + |  |  | + ### Disable busy status feature The busy status feature is deployed behind a feature flag and is **enabled by default**. diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index 703154945db..4f28558cca6 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -206,7 +206,8 @@ epics: | Failed pipeline | The author of the pipeline | | Fixed pipeline ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24309) in GitLab 13.1.) | The author of the pipeline. Enabled by default. | | Merge merge request | | -| Merge when pipeline succeeds ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211961) in GitLab 13.4) | | +| Merge when pipeline succeeds ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211961) in GitLab 13.4) | Author, Participants, Watchers, Subscribers, and Custom notification level with this event selected. `Note:` Custom notification level is ignored for Author, Watchers and Subscribers | +| Merge request [marked as ready](../project/merge_requests/drafts.md) (introduced in [GitLab 13.10](https://gitlab.com/gitlab-org/gitlab/-/issues/15332)) | Watchers and participants | | New comment | Participants, Watchers, Subscribers, and Custom notification level with this event selected, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher | | New epic | | | New issue | | diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md index 99db0c4b898..d32971a7618 100644 --- a/doc/user/profile/personal_access_tokens.md +++ b/doc/user/profile/personal_access_tokens.md @@ -21,7 +21,7 @@ Personal access tokens expire on the date you define, at midnight UTC. - GitLab runs a check at 01:00 AM UTC every day to identify personal access tokens that expire in under seven days. The owners of these tokens are notified by email. - GitLab runs a check at 02:00 AM UTC every day to identify personal access tokens that expired on the current date. The owners of these tokens are notified by email. - In GitLab Ultimate, administrators may [limit the lifetime of personal access tokens](../admin_area/settings/account_and_limit_settings.md#limiting-lifetime-of-personal-access-tokens). -- In GitLab Ultimate, administrators may [toggle enforcement of personal access token expiry](../admin_area/settings/account_and_limit_settings.md#optional-enforcement-of-personal-access-token-expiry). +- In GitLab Ultimate, administrators may [toggle enforcement of personal access token expiration](../admin_area/settings/account_and_limit_settings.md#optional-non-enforcement-of-personal-access-token-expiration). For examples of how you can use a personal access token to authenticate with the API, see the following section from our [API Docs](../../api/README.md#personalproject-access-tokens). diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index 464edf13a7e..78900e145b7 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -58,12 +58,10 @@ Dark mode is available as a navigation theme, for MVC and compatibility reasons. the future, we plan to make it configurable in its own section along with support for [different navigation themes](https://gitlab.com/gitlab-org/gitlab/-/issues/219512). -NOTE: Dark theme only works with the **Dark** syntax highlighting theme. ## Syntax highlighting theme -NOTE: GitLab uses the [rouge Ruby library](http://rouge.jneen.net/ "Rouge website") for syntax highlighting outside of any Editor context. The WebIDE (like Snippets) uses [Monaco Editor](https://microsoft.github.io/monaco-editor/) and it's provided @@ -88,11 +86,7 @@ The default syntax theme is White, and you can choose among 5 different themes:  -[Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2389) in 13.0, the theme -you choose also applies to the [Web IDE](../project/web_ide/index.md)'s code editor and [Snippets](../snippets.md). -The themes are available only in the Web IDE file editor, except for the [dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/209808) and -the [Solarized dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/219228), -which apply to the entire Web IDE screen. +Introduced in GitLab 13.6, the themes [Solarized](https://gitlab.com/gitlab-org/gitlab/-/issues/221034) and [Monokai](https://gitlab.com/gitlab-org/gitlab/-/issues/221034) also apply to the [Web IDE](../project/web_ide/index.md) and [Snippets](../snippets.md). ## Behavior @@ -114,12 +108,13 @@ select few, the amount of activity on the default Dashboard page can 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: +You can include the following options for your default dashboard view: - Your projects (default) - Starred projects - Your projects' activity - Starred projects' activity +- Followed Users' Activity - Your groups - Your [To-Do List](../todos.md) - Assigned Issues |
