summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-25 03:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-25 03:08:49 +0000
commita8c82a6395ed62380b9061a26d92e41d46c2877e (patch)
treebd8ab49ac11104ad9ae953afd4c5e0036fdddaa2 /app/views/admin
parent0b881f91159cc97ccb7328a2e52977a60ea83fbe (diff)
downloadgitlab-ce-a8c82a6395ed62380b9061a26d92e41d46c2877e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/dashboard/index.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 0ec81d0eb04..f5f6175d3d8 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -3,6 +3,12 @@
- if show_license_breakdown?
= render_if_exists 'admin/licenses/breakdown', license: @license
+- if @notices
+ - @notices.each do |notice|
+ .js-vue-alert{ 'v-cloak': true, data: { variant: notice[:type],
+ dismissible: true.to_s } }
+ = notice[:message].html_safe
+
.admin-dashboard.prepend-top-default
.row
.col-sm-4