diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-17 09:15:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-17 09:15:21 +0300 |
| commit | 4a3de4d4670e950391c02cff5f460627d93ace74 (patch) | |
| tree | e89b57a12f1159ad01e645405de3a31f3a954ecb /app/views/layouts/_flash.html.haml | |
| parent | 533309f5fc8c0bf52583d9eb49b8013dc906eef2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/_flash.html.haml')
| -rw-r--r-- | app/views/layouts/_flash.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index a302fa605e7..dded5ba76b0 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,9 +1,11 @@ --# We currently only support `alert`, `notice`, `success`, 'toast' +-# We currently only support `alert`, `notice`, `success`, 'toast', and 'raw' - icons = {'alert' => 'error', 'notice' => 'information-o', 'success' => 'check-circle'} .flash-container.flash-container-page.sticky{ data: { qa_selector: 'flash_container' } } - flash.each do |key, value| - if key == 'toast' && value .js-toast-message{ data: { message: value } } + - elsif key == 'raw' && value + = value - elsif value == I18n.t('devise.failure.unconfirmed') = render 'shared/confirm_your_email_alert' - elsif value |