diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 12:07:50 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 12:07:50 +0200 |
commit | 48b8a1f414e3d8430bd797e3db298fc5355ace2d (patch) | |
tree | c7b84ed81fb99b51eb2596df8ac1663d1998fa89 /app/views/user_mailer/warning.text.erb | |
parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
parent | 4500dc2385d8571c494ea0277fe4ca415a264404 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.
Diffstat (limited to 'app/views/user_mailer/warning.text.erb')
-rw-r--r-- | app/views/user_mailer/warning.text.erb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/views/user_mailer/warning.text.erb b/app/views/user_mailer/warning.text.erb index b4f2402cb..24c1f86f2 100644 --- a/app/views/user_mailer/warning.text.erb +++ b/app/views/user_mailer/warning.text.erb @@ -7,3 +7,16 @@ <% end %> <%= @warning.text %> +<% unless @statuses.empty? %> +<%= t('user_mailer.warning.statuses') %> + +<% @statuses.each do |status| %> + +<%= render 'notification_mailer/status', status: status %> +--- +<% end %> +<% else %> +--- +<% end %> + +<%= t 'user_mailer.warning.get_in_touch', instance: @instance %> |