Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 26 deletions

diff --git a/app/views/notify/build_ios_app_guide_email.html.haml b/app/views/notify/build_ios_app_guide_email.html.haml
deleted file mode 100644
index e9f23d3c0f9..00000000000
--- a/app/views/notify/build_ios_app_guide_email.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%tr
-  %td{ bgcolor: "#ffffff", height: "auto", style: "max-width: 600px; width: 100%; text-align: center; height: 200px; padding: 25px 15px; mso-line-height-rule: exactly; min-height: 40px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;", valign: "middle", width: "100%" }
-    = inline_image_link(@message.logo_path, { width: '150', style: 'width: 150px;' })
-    %h1{ style: "font-size: 40px; line-height: 46x; color: #000000; padding: 20px 0 0 0; font-weight: normal;" }
-      = @message.title
-%tr
-  %td{ style: "padding: 10px 20px 30px 20px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif; color:#000000; font-size: 18px; line-height: 24px;" }
-    %p{ style: "margin: 0 0 20px 0;" }
-      = @message.body_line1.html_safe
-%tr
-  %td{ align: "center", style: "padding: 20px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;" }
-    .cta_link.cta_link_primary= @message.cta_link
-    .cta_link.cta_link_secondary= @message.cta2_link
diff --git a/app/views/notify/build_ios_app_guide_email.text.erb b/app/views/notify/build_ios_app_guide_email.text.erb
deleted file mode 100644
index 59757b7c1b0..00000000000
--- a/app/views/notify/build_ios_app_guide_email.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= @message.title %>
-
-<%= @message.body_line1 %>
-
-<%= @message.cta_link %>
-
-<%= @message.cta2_link %>
-
-<%= @message.footer_links %>
-
-<%= @message.address %>
-
-<%= @message.unsubscribe %>