summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2019-04-05 05:23:42 +0100
committerLuke Bennett <lbennett@gitlab.com>2019-05-03 01:01:33 +0100
commit3d72e5739934fe73bc15fa2163bc2df0e7730c76 (patch)
tree563ec2be34f0532932d859ee0791a6adcb0a74d2 /app/views/layouts
parent75214372075b10d2ec9ad4f82c31d56bf0c524b4 (diff)
downloadgitlab-ce-3d72e5739934fe73bc15fa2163bc2df0e7730c76.tar.gz
Remove SSH public key before mirror is saved
Mirror credentials are now destroyed if there is no active mirror. The means we cannot show a public key before the mirror is saved because it will be deleted and recreated before/when it is saved. The public SSH key is now displayed only after the mirror is saved.
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_flash.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 2cdaa85bdaa..dab6f5e8725 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -3,8 +3,7 @@
.flash-container.flash-container-page
-# We currently only support `alert`, `notice`, `success`
- flash.each do |key, value|
- -# Don't show a flash message if the message is nil
- - if value
+ - if value.is_a? String
%div{ class: "flash-#{key}" }
%div{ class: "#{(container_class unless fluid_layout)} #{(extra_flash_class unless @no_container)} #{@content_class}" }
%span= value