diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-11-29 16:04:41 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-11-29 16:04:41 -0600 |
| commit | ed3fcdd09bed143b0397d8dd9aaf7b9350597920 (patch) | |
| tree | c112cd6f28b76d27ddce2d121be24375200b98d8 /app | |
| parent | fbe8dfb3008a0502fbc6234a169851a70707b7b6 (diff) | |
| download | gitlab-ce-ed3fcdd09bed143b0397d8dd9aaf7b9350597920.tar.gz | |
Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messages
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671
See
https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42
for an example of where we set `flash[:notice] = nil`
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_flash.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index 1db32379df3..05ddd0ec733 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,6 +1,8 @@ .flash-container.flash-container-page -# We currently only support `alert`, `notice`, `success` - flash.each do |key, value| - %div{ class: "flash-#{key}" } - %div{ class: (container_class) } - %span= value + -# Don't show a flash message if the message is nil + - if value + %div{ class: "flash-#{key}" } + %div{ class: (container_class) } + %span= value |