diff options
author | ThibG <thib@sitedethib.com> | 2019-09-06 12:06:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-06 12:06:59 +0200 |
commit | 286bf110c3e69042049968440f1eb99372a7e0e6 (patch) | |
tree | ddf1c32803022cb200087a8c4c6818612ca76d3b /app/views/user_mailer | |
parent | 0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff) | |
parent | 4434e2eb7f9942b44561c2f7702af3ed3854b8db (diff) |
Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/user_mailer')
-rw-r--r-- | app/views/user_mailer/warning.html.haml | 4 | ||||
-rw-r--r-- | 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 1105f2062..89dc2a75d 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 45ad3b64d..bb6610c79 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| %> |