Skip to content

Backport 'Backport smtp settings correction' on release/0.22-stable#6878

Merged
tramuntanal merged 1 commit intodecidim:release/0.22-stablefrom
Quentinchampenois:backport/smtp-settings-0.22-stable
Nov 20, 2020
Merged

Backport 'Backport smtp settings correction' on release/0.22-stable#6878
tramuntanal merged 1 commit intodecidim:release/0.22-stablefrom
Quentinchampenois:backport/smtp-settings-0.22-stable

Conversation

@Quentinchampenois
Copy link
Copy Markdown
Contributor

@Quentinchampenois Quentinchampenois commented Nov 17, 2020

🎩 What? Why?

This PR is a backport proposition of #6664 on the release/0.22-stable branch. It aims to fix smtp settings bug.

📌 Related Issues

📋 Checklist

  • ❓ 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.

♥️ Thank you!

@Quentinchampenois Quentinchampenois changed the title backport 'Backport smtp settings correction' Backport 'Backport smtp settings correction' on release/0.22-stable Nov 17, 2020
@Quentinchampenois Quentinchampenois mentioned this pull request Nov 17, 2020
Merged
12 tasks
@Quentinchampenois Quentinchampenois marked this pull request as ready for review November 17, 2020 15:43
@tramuntanal tramuntanal merged commit e86f959 into decidim:release/0.22-stable Nov 20, 2020
sauloperez added a commit to CoopCat-Confederacio-de-Cooperatives/decidim-coopcat that referenced this pull request Nov 20, 2020
@sauloperez
Upgrade to our fork's branch last commit
dba291b 
I just rebased that branch onto the latest release/0.22-stable so that
we get decidim/decidim#6878.
@sauloperez sauloperez mentioned this pull request Nov 20, 2020
Merged
@Dynnammo Dynnammo mentioned this pull request Nov 20, 2020
Closed
@Quentinchampenois Quentinchampenois mentioned this pull request Nov 20, 2020
Merged
Quentinchampenois added a commit to Quentinchampenois/decidim that referenced this pull request Nov 20, 2020
@Quentinchampenois
Revert "Backport 'Backport smtp settings correction' to v0.22 (decidi…
ef0f3b3 
…m#6878)"

This reverts commit e86f959.
@Quentinchampenois Quentinchampenois mentioned this pull request Nov 20, 2020
Merged
tramuntanal
tramuntanal reviewed Nov 20, 2020
View reviewed changes
decidim-system/db/migrate/20201013132945_update_smtp_from_label.rb
class UpdateSmtpFromLabel < ActiveRecord::Migration[5.2]
def change
Decidim::Organization.all.each do |org|
if org.smtp_settings[:from_email].blank?
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal Nov 20, 2020

Choose a reason for hiding this comment

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

if smtp_settings are nil, the fetch of the :from_email will fail.

sauloperez added a commit to coopdevs/decidim that referenced this pull request Nov 20, 2020
@sauloperez
Revert "Backport 'Backport smtp settings correction' to v0.22 (decidi…
e455fee 
…m#6878)"

This reverts commit e86f959.
tramuntanal pushed a commit that referenced this pull request Nov 25, 2020
@Quentinchampenois
Backport 'Correct smtp_settings keys type' on release/0.22-stable (#6905
a46bf2a 
)

* Revert "Backport 'Backport smtp settings correction' to v0.22 (#6878)"

This reverts commit e86f959.

* Backport smtp settings on release 0.22 stable

* Revert for backport

This reverts commit ef0f3b3.

* Backport 'Correct smtp_settings keys type'
davidbeig pushed a commit to CoopCat-Confederacio-de-Cooperatives/decidim-coopcat that referenced this pull request Dec 2, 2025
@sauloperez
Upgrade to our fork's branch last commit
140aed8 
I just rebased that branch onto the latest release/0.22-stable so that
we get decidim/decidim#6878.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@tramuntanal tramuntanal tramuntanal approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Quentinchampenois @tramuntanal