diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/helpers/broadcast_messages_helper.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/helpers/broadcast_messages_helper.rb')
-rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index dda834ee2c5..b138e9aeb0c 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -25,23 +25,7 @@ module BroadcastMessagesHelper def broadcast_message(message, opts = {}) return unless message.present? - render "shared/broadcast_message", { message: message, opts: opts } - end - - def broadcast_message_style(broadcast_message) - return '' if broadcast_message.notification? - - style = [] - - if broadcast_message.color.present? - style << "background-color: #{broadcast_message.color}" - end - - if broadcast_message.font.present? - style << "color: #{broadcast_message.font}" - end - - style.join('; ') + render "shared/broadcast_message", { message: message, **opts } end def broadcast_message_status(broadcast_message) @@ -70,6 +54,10 @@ module BroadcastMessagesHelper BroadcastMessage.broadcast_types.keys.map { |w| [w.humanize, w] } end + def broadcast_theme_options + BroadcastMessage.themes.keys + end + def target_access_level_options BroadcastMessage::ALLOWED_TARGET_ACCESS_LEVELS.map do |access_level| [Gitlab::Access.human_access(access_level), access_level] |