From e515b23aff8106fe6f57f55d4cc58c385ffce6d6 Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Tue, 19 Nov 2024 15:21:52 -0700 Subject: [PATCH 1/2] Edit contents of confirmation email The upcoming `4.1.1+portage-4.2.3` release will require all existing users to confirm their emails. This commit edits the contents of that confirmation email. "Thank you for registering." makes sense for users that just created an account, but doesn't sound right when read by users with existing accounts. Thus, we are removing the sentence. --- app/views/devise/mailer/confirmation_instructions.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index 86e1dc239b..481d1d1d7d 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -1,7 +1,7 @@ <% I18n.with_locale I18n.locale do %>

<%= _("Welcome to %{application_name}") % {application_name: ApplicationService.application_name} %>, <%= @email %>!

-

<%= _("Thank you for registering. Please confirm your email address") %>:

+

<%= _("Please confirm your email address") %>:

<%= link_to _("Click here to confirm your account"), confirmation_url(@resource, :confirmation_token => @token) %> (<%= _("or copy") %> <%= confirmation_url(@resource, :confirmation_token => @token) %> <%= _("into your browser") %>).

<% end %> From 9a018b6e84cfbfa1a39baa3be04d10133f20163d Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Tue, 19 Nov 2024 15:33:11 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22ab25696d..705e10e317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Changed - - Email Confirmation Changes [#923](https://github.com/portagenetwork/roadmap/pull/923) + - Email Confirmation Changes [#923](https://github.com/portagenetwork/roadmap/pull/923), [#952](https://github.com/portagenetwork/roadmap/pull/952) - Disable Updating of User Emails [#917](https://github.com/portagenetwork/roadmap/pull/917)