-
Notifications
You must be signed in to change notification settings - Fork 166
LG-1383 Send emails for error conditions in add email #3075
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7b3ab3b
LG-1383 Send emails for error conditions in add email
stevegsa 710f057
Fix spec
stevegsa 2b75f7a
Fix coverage
stevegsa 35ab012
Translations
stevegsa c1e1635
Merge branch 'master' into stevegsa-add-email-confirm-emails
achapm cca4df0
Updated copy per Michelle
stevegsa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
app/views/user_mailer/add_email_associated_with_another_account.html.slim
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| p.lead == t('.intro', app: link_to(APP_NAME, Figaro.env.mailer_domain_name, class: 'gray')) | ||
|
|
||
| table.button.expanded.large.radius | ||
| tbody | ||
| tr | ||
| td | ||
| table | ||
| tbody | ||
| tr | ||
| td | ||
| center | ||
| = link_to t('.link_text', app: APP_NAME), | ||
| @root_url, target: '_blank', | ||
| class: 'float-center', align: 'center' | ||
| td.expander | ||
|
|
||
| p = link_to @root_url, @root_url, target: '_blank' | ||
|
|
||
| table.spacer | ||
| tbody | ||
| tr | ||
| td.s10 height="10px" | ||
| | | ||
| table.hr | ||
| tr | ||
| th | ||
| | | ||
|
|
||
| p == t('.reset_password', | ||
| app: link_to(APP_NAME, Figaro.env.mailer_domain_name, class: 'gray')) | ||
|
|
||
| p == t('.help', | ||
| app: link_to(APP_NAME, Figaro.env.mailer_domain_name, class: 'gray'), | ||
| help_link: link_to(t('user_mailer.help_link_text'), MarketingSite.help_url), | ||
| contact_link: link_to(t('user_mailer.contact_link_text'), MarketingSite.contact_url)) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion... convert this to .html.erb