From 5fd46dddd7b1d5482c3173c8bcfba0899293307f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Oct 2022 00:03:52 +0200
Subject: Remove unnecessary sections from welcome e-mail (#19299)

---
 app/views/user_mailer/welcome.html.haml | 47 +--------------------------------
 app/views/user_mailer/welcome.text.erb  | 13 ---------
 2 files changed, 1 insertion(+), 59 deletions(-)

(limited to 'app/views/user_mailer')

diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 1f75ff48a..3ab994ad3 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -76,26 +76,7 @@
                                     %td.button-primary
                                       = link_to settings_profile_url do
                                         %span= t 'user_mailer.welcome.edit_profile_action'
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.review_preferences_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to settings_preferences_url do
-                                        %span= t 'user_mailer.welcome.review_preferences_action'
+
               %tr
                 %td.content-cell.padded-bottom
                   .email-row
@@ -116,29 +97,3 @@
                                     %td.button-primary
                                       = link_to web_url do
                                         %span= t 'user_mailer.welcome.final_action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.border-top
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %h5= t 'user_mailer.welcome.tips'
-                              %ul
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_mobile_webapp'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_following'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_local_timeline', instance: @instance
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_federated_timeline'
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index e310d7ca6..d78cdb938 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -11,19 +11,6 @@
 
 => <%= settings_profile_url %>
 
-<%= t 'user_mailer.welcome.review_preferences_step' %>
-
-=> <%= settings_preferences_url %>
-
 <%= t 'user_mailer.welcome.final_step' %>
 
 => <%= web_url %>
-
----
-
-<%= t 'user_mailer.welcome.tips' %>
-
-* <%= t 'user_mailer.welcome.tip_mobile_webapp' %>
-* <%= t 'user_mailer.welcome.tip_following' %>
-* <%= t 'user_mailer.welcome.tip_local_timeline', instance: @instance %>
-* <%= t 'user_mailer.welcome.tip_federated_timeline' %>
-- 
cgit