From d06902461e8d8a447ab014c1ab9e640397cb4b9c Mon Sep 17 00:00:00 2001 From: Arnelle Balane Date: Tue, 26 Feb 2019 04:00:34 +0800 Subject: [PATCH] Fix linting issues in app/views/mailers (#1889) [ci skip] --- .../mailers/digest_mailer/digest_email.html.erb | 3 +-- .../new_membership_subscription_email.html.erb | 10 +++++----- .../subscription_cancellation_email.html.erb | 2 +- .../subscription_update_confirm_email.html.erb | 2 +- .../notify_mailer/account_deleted_email.html.erb | 1 - .../feedback_message_resolution_email.html.erb | 2 +- .../mailers/notify_mailer/mentee_email.html.erb | 15 ++++++--------- .../notify_mailer/new_badge_email.html.erb | 6 +++--- .../notify_mailer/new_follower_email.html.erb | 2 +- .../notify_mailer/new_mention_email.html.erb | 2 +- .../notify_mailer/new_message_email.html.erb | 6 +++--- .../notify_mailer/new_reply_email.html.erb | 3 ++- .../video_upload_complete_email.html.erb | 2 +- .../scholarship_awarded_email.html.erb | 2 +- 14 files changed, 27 insertions(+), 31 deletions(-) diff --git a/app/views/mailers/digest_mailer/digest_email.html.erb b/app/views/mailers/digest_mailer/digest_email.html.erb index 9df3bf28f..b8cd0ba9b 100644 --- a/app/views/mailers/digest_mailer/digest_email.html.erb +++ b/app/views/mailers/digest_mailer/digest_email.html.erb @@ -16,14 +16,13 @@ <% end %> -
<% if @user.follows.size == 0 %> DEV Digest is a new periodic email featuring the best posts from our community of developers. -

+

Your digest is not yet customized. Follow the people and technologies on dev.to that interest you in order to receive the most relevant posts in your inbox. <% else %> <% tip_rand = rand(5) %> diff --git a/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb b/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb index b49bb57f3..34bb35e17 100644 --- a/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb +++ b/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb @@ -1,4 +1,4 @@ - + <% if @subscription_type == "triple_unicorn_member" %>

Whoa! You’re the best, and so generous. We tip our hats to you. @@ -36,7 +36,7 @@

❤️ -
+
PBJ

@@ -60,7 +60,7 @@

Thanks again! ❤️ -
+
PBJ

<% elsif @subscription_type == "level_2_member" %> @@ -78,7 +78,7 @@

Thanks again! ❤️ -
+
PBJ

<% elsif @subscription_type == "level_1_member" %> @@ -96,7 +96,7 @@

Thanks again! ❤️ -
+
PBJ

<% end %> diff --git a/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb b/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb index 653393d4f..e3aae25a8 100644 --- a/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb +++ b/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb @@ -7,6 +7,6 @@ If you have any feedback that can help us improve the membership experience, ple

Thanks again, -
+
PBJ

diff --git a/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb b/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb index 8b41354a7..105fe94db 100644 --- a/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb +++ b/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb @@ -1,4 +1,4 @@ - +" style="height:200px; display: block; margin-left: auto; margin-right: auto;" />

Your DEV sustaining membership monthly contribution amount has been updated. Be sure to check your membership settings page to see the most up-to-date information.

diff --git a/app/views/mailers/notify_mailer/account_deleted_email.html.erb b/app/views/mailers/notify_mailer/account_deleted_email.html.erb index 6bc2d027d..7df78ab7e 100644 --- a/app/views/mailers/notify_mailer/account_deleted_email.html.erb +++ b/app/views/mailers/notify_mailer/account_deleted_email.html.erb @@ -2,7 +2,6 @@ Hi <%= @name %>,

-

Your dev.to account has been successfully deleted.

diff --git a/app/views/mailers/notify_mailer/feedback_message_resolution_email.html.erb b/app/views/mailers/notify_mailer/feedback_message_resolution_email.html.erb index a5a2d3cbc..2e34d87eb 100644 --- a/app/views/mailers/notify_mailer/feedback_message_resolution_email.html.erb +++ b/app/views/mailers/notify_mailer/feedback_message_resolution_email.html.erb @@ -1,3 +1,3 @@

<%= simple_format @email_body %> -

\ No newline at end of file +

diff --git a/app/views/mailers/notify_mailer/mentee_email.html.erb b/app/views/mailers/notify_mailer/mentee_email.html.erb index 086db09e9..e174d2a76 100644 --- a/app/views/mailers/notify_mailer/mentee_email.html.erb +++ b/app/views/mailers/notify_mailer/mentee_email.html.erb @@ -5,7 +5,7 @@ Let me get straight to the point: your mentor is @<%= @mentor.username %>. We have had you two automatically follow each other, so you can find them on DEV Connect, and introduce yourself!

- A few notes:  + A few notes:

  • @@ -15,10 +15,10 @@ We expect everyone to abide by our Code of Conduct, especially in this setting. Should your mentor demonstrate inappropriate behavior, please contact us immediately.
  • - If you feel like this was a mismatch, or if your mentor is unresponsive after several days, let us know.  + If you feel like this was a mismatch, or if your mentor is unresponsive after several days, let us know.
    • -
  • - We highly recommend setting goals and expectations with your mentor from Day 1.  +
  • + We highly recommend setting goals and expectations with your mentor from Day 1.
  • To help you all get started, we’ve put together some resources. @@ -26,14 +26,11 @@

- Thanks again for participating in our program.  + Thanks again for participating in our program.

Good luck!

- Liana  + Liana

- - - diff --git a/app/views/mailers/notify_mailer/new_badge_email.html.erb b/app/views/mailers/notify_mailer/new_badge_email.html.erb index d302cf4c3..b136d0aba 100644 --- a/app/views/mailers/notify_mailer/new_badge_email.html.erb +++ b/app/views/mailers/notify_mailer/new_badge_email.html.erb @@ -3,7 +3,7 @@ Congratulations, <%= @user.name %>! You received the <%= @badge.title %> badge!

- +

<%= @badge.description %> @@ -13,10 +13,10 @@ <%= @badge_achievement.rewarding_context_message.html_safe %>

-
+

Check out your profile

-
\ No newline at end of file + diff --git a/app/views/mailers/notify_mailer/new_follower_email.html.erb b/app/views/mailers/notify_mailer/new_follower_email.html.erb index 1eef900cc..0c1436b78 100644 --- a/app/views/mailers/notify_mailer/new_follower_email.html.erb +++ b/app/views/mailers/notify_mailer/new_follower_email.html.erb @@ -3,7 +3,7 @@ <% end %>

<%= @follower.name %> just followed you 🤗

-

You now have <%= pluralize(@user.followers_count, 'total follower') %>. See all of your recent followers right here.

+

You now have <%= pluralize(@user.followers_count, "total follower") %>. See all of your recent followers right here.

When someone follows you on dev.to, your posts will be prioritized in their feed and notifications. The perks of popularity I suppose.

diff --git a/app/views/mailers/notify_mailer/new_mention_email.html.erb b/app/views/mailers/notify_mailer/new_mention_email.html.erb index 30eef5ee1..b2b6dd02c 100644 --- a/app/views/mailers/notify_mailer/new_mention_email.html.erb +++ b/app/views/mailers/notify_mailer/new_mention_email.html.erb @@ -3,5 +3,5 @@ <%= @mentionable.processed_html.html_safe %> - view on dev.to + view on dev.to diff --git a/app/views/mailers/notify_mailer/new_message_email.html.erb b/app/views/mailers/notify_mailer/new_message_email.html.erb index 16bc0209c..71a72fba0 100644 --- a/app/views/mailers/notify_mailer/new_message_email.html.erb +++ b/app/views/mailers/notify_mailer/new_message_email.html.erb @@ -2,9 +2,9 @@
<%= @message.message_html %> -

+

view on dev.to
-
+
-You only get emails like this if you have not been active on dev.to/connect in the past day. You may disable this type of email in your settings. \ No newline at end of file +You only get emails like this if you have not been active on dev.to/connect in the past day. You may disable this type of email in your settings. diff --git a/app/views/mailers/notify_mailer/new_reply_email.html.erb b/app/views/mailers/notify_mailer/new_reply_email.html.erb index 34a874b41..98c2734a9 100644 --- a/app/views/mailers/notify_mailer/new_reply_email.html.erb +++ b/app/views/mailers/notify_mailer/new_reply_email.html.erb @@ -6,5 +6,6 @@

re: <%= @comment.commentable.title %>

<%= @comment.processed_html.html_safe %> - view on dev.to read original post + view on dev.to  + read original post diff --git a/app/views/mailers/notify_mailer/video_upload_complete_email.html.erb b/app/views/mailers/notify_mailer/video_upload_complete_email.html.erb index cb3385c85..4a2e2ee64 100644 --- a/app/views/mailers/notify_mailer/video_upload_complete_email.html.erb +++ b/app/views/mailers/notify_mailer/video_upload_complete_email.html.erb @@ -4,4 +4,4 @@

🎥 Finalize and publish your video 😊 -

\ No newline at end of file + diff --git a/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb b/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb index da8ea7136..357f12f4f 100644 --- a/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb +++ b/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb @@ -1,4 +1,4 @@ - +

Congratulations!

We’ve received your DEV scholarship application and are excited to provide you with a workshop pass for