From 92a6fa6c90fda809554ae2cac10036202723f5c9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 3 Sep 2019 05:57:30 +0200
Subject: [PATCH] Fix error in user warning template (#11741)

---
 app/views/user_mailer/warning.html.haml | 4 ++--
 app/views/user_mailer/warning.text.erb  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 1105f2062f..89dc2a75db 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -42,11 +42,11 @@
                               - unless @warning.text.blank?
                                 = Formatter.instance.linkify(@warning.text)
 
-                              - unless @statuses&.empty?
+                              - if !@statuses.nil? && !@statuses.empty?
                                 %p
                                   %strong= t('user_mailer.warning.statuses')
 
-- unless @statuses&.empty?
+- if !@statuses.nil? && !@statuses.empty?
   - @statuses.each_with_index do |status, i|
     = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true
 
diff --git a/app/views/user_mailer/warning.text.erb b/app/views/user_mailer/warning.text.erb
index 45ad3b64d4..bb6610c79b 100644
--- a/app/views/user_mailer/warning.text.erb
+++ b/app/views/user_mailer/warning.text.erb
@@ -7,7 +7,7 @@
 
 <% end %>
 <%= @warning.text %>
-<% unless @statuses&.empty? %>
+<% if !@statuses.nil? && !@statuses.empty? %>
 <%= t('user_mailer.warning.statuses') %>
 
 <% @statuses.each do |status| %>
-- 
GitLab