Skip to content

Update Gencat's decidim fork master branch with decidim/decidim's master #2

Merged
agustibr merged 2 commits intogencat:masterfrom
decidim:master
Mar 25, 2019
Merged

Update Gencat's decidim fork master branch with decidim/decidim's master #2
agustibr merged 2 commits intogencat:masterfrom
decidim:master

Conversation

@agustibr
Copy link
Copy Markdown

@agustibr agustibr commented Mar 25, 2019

🎩 What? Why?

Update gencat's decidim fork master branch with

decidim-bot and others added 2 commits March 22, 2019 16:20
#### 🎩 What? Why?
We got an automated report that one of our dependencies had a security alert. This PR updates it to a version that solves this problem.

#### 📌 Related Issues
None

#### 📋 Subtasks
None

Co-authored-by: Oriol Gual <oriol@codegram.com>
@agustibr agustibr marked this pull request as ready for review March 25, 2019 11:33
@agustibr agustibr merged commit b63317f into gencat:master Mar 25, 2019
tramuntanal pushed a commit that referenced this pull request Feb 10, 2021
* revert keys type in smtp_settings from symbol to strings

* switch smtp_settings keys from symbols to strings

* Fix smtp settings specs (#2)

* light cleanup application mailer specs

* add tests in register organization specs

* Revert "Fix smtp settings specs (#2)" (#3)

This reverts commit 9838bec.

* Update organization seeds (#1)

* Update organization seeds

* Fix migration

* Clean tests

* Complete migration by adding down

* Fix smtp settings specs (#4)

* light cleanup application mailer specs

* add tests in register organization specs

* Remove migration and update CHANGELOG

* Remove CHANGELOG entry

Co-authored-by: Quentin Champ <26109239+Quentinchampenois@users.noreply.github.com>
Co-authored-by: Armand Fardeau <armandfardeau@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants