diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:56 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:56 +0000 |
commit | 775816e676aae53509d7b6f364945f2720636f72 (patch) | |
tree | 0baa821597f08edce720b236b0c07a6d13893f85 /app/views/layouts | |
parent | e98d69bc8b8b926a727d36e37d2ee30c9fa28907 (diff) | |
download | gitlab-ce-775816e676aae53509d7b6f364945f2720636f72.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/_broadcast.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/layouts/_broadcast.html.haml b/app/views/layouts/_broadcast.html.haml index ee3ca824342..9d7ad249ac8 100644 --- a/app/views/layouts/_broadcast.html.haml +++ b/app/views/layouts/_broadcast.html.haml @@ -1,2 +1,4 @@ -- current_broadcast_messages&.each do |message| +- current_broadcast_banner_messages.each do |message| = broadcast_message(message) +- if Feature.enabled?(:broadcast_notification_type) + = broadcast_message(current_broadcast_notification_message) |