closed-social
/
mastodon
3
0
Fork 2
Code Issues 5 Pull Requests 0 Projects 0 Releases 3 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
8734 Commits
4 Branches
567 MiB
Tree: 5524258da9
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '5524258da9'
${ noResults }
mastodon/app/views/user_mailer/email_changed.html.haml

58 lines
2.2 KiB
Raw Normal View History

HTML e-mails for UserMailer (#6256) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
6 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Bump webpacker from 3.5.5 to 4.0.2 (#10277) Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years ago
HTML e-mails for UserMailer (#6256) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
6 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Fix “Email changed” notification sometimes having wrong e-mail (#13475) * Fix “Email changed” notification sometimes having wrong e-mail Fixes #6778 The root of the issue is that `send_devise_notification` was called before the changes were properly commited to the database, causing the mailer to pick previous values if running too early. Devise's documentation provides guidance on how to handle that[1][2], however, I have found it to not be working, as the following happens, in that order: - `send_devise_notification` is called for the `email_changed` notification. In that case, `changed?` is false and `saved_changes?` is true, so if we use the former, we have the same issue. - the `after_commit` hook is called - `send_devise_notification` is called for the `confirmation_instructions` notification. In that case, `changed?` is still false, and `saved_changes?` still true, so if we use the latter, that second notification email is simply not going to be sent (as we would be queuing the notification *after* executing the after_commit hook). This is because it may be called from either an `after_update` or `after_commit` hook, the difference not being a call to `save` but the transaction actually being committed to the database. This may arguably be a bug in Devise, or Devise's notification. The proposed workaround is inspired by Devise's documentation but checks whether a transaction is open to make the call whether to immediately send the notification or defer it to the `after_commit` hook. [1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification [2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194 * Fix cases when sending notifications without changing the model * Defer sending if and only if in transaction including current record
4 years ago
HTML e-mails for UserMailer (#6256) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
6 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. %table.email-table{ cellspacing: 0, cellpadding: 0 }
  2.   %tbody
  3.     %tr
  4.       %td.email-body
  5.         .email-container
  6.           %table.content-section{ cellspacing: 0, cellpadding: 0 }
  7.             %tbody
  8.               %tr
  9.                 %td.content-cell.hero
  10.                   .email-row
  11.                     .col-6
  12.                       %table.column{ cellspacing: 0, cellpadding: 0 }
  13.                         %tbody
  14.                           %tr
  15.                             %td.column-cell.text-center.padded
  16.                               %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
  17.                                 %tbody
  18.                                   %tr
  19.                                     %td
  20.                                       = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
  21. 

  22.                               %h1= t 'devise.mailer.email_changed.title'
  23.                               %p.lead= t 'devise.mailer.email_changed.explanation'
  24. 

  25. %table.email-table{ cellspacing: 0, cellpadding: 0 }
  26.   %tbody
  27.     %tr
  28.       %td.email-body
  29.         .email-container
  30.           %table.content-section{ cellspacing: 0, cellpadding: 0 }
  31.             %tbody
  32.               %tr
  33.                 %td.content-cell.content-start
  34.                   %table.column{ cellspacing: 0, cellpadding: 0 }
  35.                     %tbody
  36.                       %tr
  37.                         %td.column-cell.input-cell
  38.                           %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
  39.                             %tbody
  40.                               %tr
  41.                                 %td= @resource.unconfirmed_email
  42. 

  43. %table.email-table{ cellspacing: 0, cellpadding: 0 }
  44.   %tbody
  45.     %tr
  46.       %td.email-body
  47.         .email-container
  48.           %table.content-section{ cellspacing: 0, cellpadding: 0 }
  49.             %tbody
  50.               %tr
  51.                 %td.content-cell
  52.                   .email-row
  53.                     .col-6
  54.                       %table.column{ cellspacing: 0, cellpadding: 0 }
  55.                         %tbody
  56.                           %tr
  57.                             %td.column-cell.text-center.padded
  58.                               %p= t 'devise.mailer.email_changed.extra'