Skip to content

Fix smtp_settings keys type#6908

Merged
tramuntanal merged 10 commits intodecidim:developfrom
Dynnammo:fix/smtp_settings_keys_type
Nov 25, 2020
Merged

Fix smtp_settings keys type#6908
tramuntanal merged 10 commits intodecidim:developfrom
Dynnammo:fix/smtp_settings_keys_type

Conversation

@Dynnammo
Copy link
Copy Markdown
Contributor

@Dynnammo Dynnammo commented Nov 20, 2020

🎩 What? Why?

Correct the regression introduced in a PR I made previously : #6664

While @Quentinchampenois is making a revert here #6905 and here #6904 for the releases that are affected, this correction aims to correct regressions introduced, while keeping corrections made in #6664 (which are the correct setup of from and from_email field), in order not to fall back on the previous situation

📌 Related Issues

Link your PR to an issue

Testing

Should need a production environment to correctly test the email sending with the modification of all parameters in the set_smtp method

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • AVOID breaking the continuous integration build.
  • AVOID making significant changes to the overall architecture.

📷 Screenshots

Please add screenshots of the changes you're proposing
Description

♥️ Thank you!

sauloperez
sauloperez previously approved these changes Nov 20, 2020
@Dynnammo
Copy link
Copy Markdown
Contributor Author

Hi @sauloperez! thanks for the review, I'm currently adding tests in application_mailer_spec to check the correction.

sauloperez added a commit to CoopCat-Confederacio-de-Cooperatives/decidim-coopcat that referenced this pull request Nov 20, 2020
There's a fix in decidim/decidim#6908 for the
regression introduced in decidim/decidim#6664,
but its revert done in decidim/decidim#6905 is
not merged either. We can't wait any longer so I'm doing the revert
myself.
Quentinchampenois and others added 6 commits November 20, 2020 17:23
* light cleanup application mailer specs

* add tests in register organization specs
* Update organization seeds

* Fix migration
* light cleanup application mailer specs

* add tests in register organization specs
@Dynnammo Dynnammo marked this pull request as ready for review November 20, 2020 18:34
@tramuntanal
Copy link
Copy Markdown
Contributor

Re-running admin and proposals workflows that got stuck

Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dynnammo can you check my comment ?

@tramuntanal
Copy link
Copy Markdown
Contributor

@Dynnammo can you proceed with the backports please?

@tramuntanal tramuntanal merged commit 5f4e954 into decidim:develop Nov 25, 2020
tramuntanal pushed a commit that referenced this pull request Nov 25, 2020
…le (#6904)

* Revert "Backport 'backport smtp settings correction' to 0.23 (#6877)"

This reverts commit 73bd3d1.

* Backport 'Correct smtp_settings keys type' on release/0.23 stable

* Revert for backport

This reverts commit 0757303.

* Backport 'Correct smtp_settings keys type'
@mrcasals mrcasals changed the title Correct smtp_settings keys type Fix smtp_settings keys type Feb 26, 2021
@mrcasals mrcasals added module: system type: fix PRs that implement a fix for a bug labels Feb 26, 2021
davidbeig pushed a commit to CoopCat-Confederacio-de-Cooperatives/decidim-coopcat that referenced this pull request Dec 2, 2025
There's a fix in decidim/decidim#6908 for the
regression introduced in decidim/decidim#6664,
but its revert done in decidim/decidim#6905 is
not merged either. We can't wait any longer so I'm doing the revert
myself.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

module: system type: fix PRs that implement a fix for a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants