diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
| commit | 77237c5a6b9044f58beabc54d3589e5fa09cbfba (patch) | |
| tree | f43188047fe8955f6cf78e05ae9c2e8f6a019e0b /app/views/admin | |
| parent | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 9577a2a79df..8b86a024a6e 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -46,6 +46,13 @@ = render_suggested_colors + .form-group.row.js-broadcast-message-dismissable-form-group{ class: ('hidden' unless @broadcast_message.banner? ) } + .col-sm-2.col-form-label.pt-0 + = f.label :starts_at, _("Dismissable") + .col-sm-10 + = f.check_box :dismissable + = f.label :dismissable do + = _('Allow users to dismiss the broadcast message') .form-group.row.js-toggle-colors-container.toggle-colors.hide .col-sm-2.col-form-label = f.label :font, "Font Color" |