Backport 'Correct smtp_settings keys type' on release/0.22-stable#6905
Merged
tramuntanal merged 2 commits intodecidim:release/0.22-stablefrom Nov 25, 2020
Conversation
This was referenced Nov 20, 2020
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.
* Revert for backport This reverts commit ef0f3b3. * Backport 'Correct smtp_settings keys type'
tramuntanal
approved these changes
Nov 25, 2020
Contributor
|
Merging as the erb-linter error is not related with this PR and it doesn't change any erb file |
sauloperez
added a commit
to CoopCat-Confederacio-de-Cooperatives/decidim-coopcat
that referenced
this pull request
Nov 30, 2020
Now we can point back to upstream because decidim/decidim#6938, decidim/decidim#6905 and decidim/decidim#6893 have been merged. There were also other bug fixes in between.
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.
davidbeig
pushed a commit
to CoopCat-Confederacio-de-Cooperatives/decidim-coopcat
that referenced
this pull request
Dec 2, 2025
Now we can point back to upstream because decidim/decidim#6938, decidim/decidim#6905 and decidim/decidim#6893 have been merged. There were also other bug fixes in between.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This reverts commit e86f959.
🎩 What? Why?
I apologize for this reverted backport proposition, we just noticed this morning a smtp settings issue introduced by #6664
UPDATE
This PR is no longer a revert but a backport of fixes added in #6908
📌 Related Issues