diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/admin_area/broadcast_messages.md | 36 | ||||
-rw-r--r-- | doc/user/admin_area/img/broadcast_messages.png | bin | 21458 -> 0 bytes | |||
-rw-r--r-- | doc/user/admin_area/img/broadcast_messages_banner_v12_10.png | bin | 0 -> 34040 bytes | |||
-rw-r--r-- | doc/user/admin_area/img/broadcast_messages_notification_v12_10.png | bin | 0 -> 71249 bytes | |||
-rw-r--r-- | doc/user/gitlab_com/index.md | 3 |
5 files changed, 37 insertions, 2 deletions
diff --git a/doc/user/admin_area/broadcast_messages.md b/doc/user/admin_area/broadcast_messages.md index 416bd3bfd00..ed03e8a57f3 100644 --- a/doc/user/admin_area/broadcast_messages.md +++ b/doc/user/admin_area/broadcast_messages.md @@ -4,14 +4,46 @@ type: reference, howto # Broadcast Messages **(CORE ONLY)** -GitLab can display messages to all users of a GitLab instance in a banner that appears in the UI. +GitLab can display broadcast messages to all users of a GitLab instance. There are two types of broadcast messages: -![Broadcast Message](img/broadcast_messages.png) +- banners +- notifications + +You can style a message's content using the `a` and `br` HTML tags. The `br` tag inserts a line break. The `a` HTML tag accepts `class` and `style` attributes with the following CSS properties: + +- `color` +- `border` +- `background` +- `padding` +- `margin` +- `text-decoration` + +## Banners + +Banners are shown on the top of a page. + +![Broadcast Message Banner](img/broadcast_messages_banner_v12_10.png) + +## Notifications + +Notifications are shown on the bottom right of a page and can contain placeholders. A placeholder is replaced with an attribute of the active user. Placeholders must be surrounded by curly braces, for example `{{name}}`. +The available placeholders are: + +- `{{email}}` +- `{{name}}` +- `{{user_id}}` +- `{{username}}` +- `{{instance_id}}` + +If the user is not signed in, user related values will be empty. + +![Broadcast Message Notification](img/broadcast_messages_notification_v12_10.png) Broadcast messages can be managed using the [broadcast messages API](../../api/broadcast_messages.md). NOTE: **Note:** If more than one banner message is active at one time, they are displayed in a stack in order of creation. +If more than one notification message is active at one time, only the newest is shown. ## Adding a broadcast message diff --git a/doc/user/admin_area/img/broadcast_messages.png b/doc/user/admin_area/img/broadcast_messages.png Binary files differdeleted file mode 100644 index f0ae92f8c17..00000000000 --- a/doc/user/admin_area/img/broadcast_messages.png +++ /dev/null diff --git a/doc/user/admin_area/img/broadcast_messages_banner_v12_10.png b/doc/user/admin_area/img/broadcast_messages_banner_v12_10.png Binary files differnew file mode 100644 index 00000000000..f3c468d158e --- /dev/null +++ b/doc/user/admin_area/img/broadcast_messages_banner_v12_10.png diff --git a/doc/user/admin_area/img/broadcast_messages_notification_v12_10.png b/doc/user/admin_area/img/broadcast_messages_notification_v12_10.png Binary files differnew file mode 100644 index 00000000000..98ea48ccd3c --- /dev/null +++ b/doc/user/admin_area/img/broadcast_messages_notification_v12_10.png diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 58d834bb9d2..a99444c013f 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -87,6 +87,9 @@ or over the size limit, you can [reduce your repository size with Git](../projec | ----------- | ----------------- | ------------- | | Repository size including LFS | 10G | Unlimited | +NOTE: **Note:** +A single `git push` is limited to 5GB. LFS is not affected by this limit. + ## IP range GitLab.com is using the IP range `34.74.90.64/28` for traffic from its Web/API |