diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 21:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 21:07:43 +0300 |
| commit | 1e1012d3d28c426637eecc0909c415fe2c8b7c3a (patch) | |
| tree | d230780752bb3b98cf4f3ede1c6f8e98c9a238c7 /doc/user | |
| parent | 3c55affa6684311ca73bc4e3d3bfb17b7541f63b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/free_push_limit.md | 4 | ||||
| -rw-r--r-- | doc/user/profile/index.md | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/user/free_push_limit.md b/doc/user/free_push_limit.md index c0b23720ab1..c1be8287eb1 100644 --- a/doc/user/free_push_limit.md +++ b/doc/user/free_push_limit.md @@ -6,9 +6,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Free push limit **(FREE SAAS)** -A 100 MB per-file limit applies when pushing new files to any project in the Free tier. +A 100 MiB per-file limit applies when pushing new files to any project in the Free tier. -If a new file that is 100 MB or large is pushed to a project in the Free tier, an error is displayed. For example: +If a new file that is 100 MiB or large is pushed to a project in the Free tier, an error is displayed. For example: ```shell Enumerating objects: 3, done. diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index 6536a992292..fea9bc491cf 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -128,6 +128,8 @@ to match your username. ## Add external accounts to your user profile page +> Mastodon user account [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132892) as a beta feature in 16.5 [with a flag](../feature_flags.md) named `mastodon_social_ui`. Disabled by default. + You can add links to certain other external accounts you might have, like Skype and Twitter. They can help other users connect with you on other platforms. @@ -138,6 +140,7 @@ To add links to other accounts: 1. In the **Main settings** section, add your: - Discord [user ID](https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-). - LinkedIn profile name. + - Mastodon username. - Skype username. - Twitter @username. |