Skip to content

Backport to let components without step settings be added#6144

Merged
ivan-mr merged 4 commits into0.21-stablefrom
backport/fix-adding-components-without-step-config
Jun 3, 2020
Merged

Backport to let components without step settings be added#6144
ivan-mr merged 4 commits into0.21-stablefrom
backport/fix-adding-components-without-step-config

Conversation

@jesusdb
Copy link
Copy Markdown
Contributor

@jesusdb jesusdb commented Jun 2, 2020

🎩 What? Why?

This is a backport to fix an error raised when creating a sortition component if no setting is added.

📌 Related Issues

mrcasals and others added 3 commits June 2, 2020 10:26
* Let components without step settings be added

* Add changelog

* Add tests

* New Crowdin translations (#5761)

* New translations en.yml (French)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

Co-authored-by: Txus <me@txus.io>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>
Co-authored-by: Oliver Valls <oliver.vh@coditramuntana.com>
@jesusdb jesusdb requested review from Leusev and ivan-mr June 2, 2020 08:58
@andreslucena
Copy link
Copy Markdown
Member

Hi @jesusdb
Why are we backporting this? Has @decidim/product asked for this? As far as I see we could already close #5428 - at least on develop is already working.

@Leusev Leusev added in-review and removed in-review labels Jun 2, 2020
Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

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

I looks for me @jesusdb 👍
Could you solve that changelog conflict please?
Thanks!

@jesusdb
Copy link
Copy Markdown
Contributor Author

jesusdb commented Jun 3, 2020

Hi @andreslucena, this is because we're fixing the error from one of our clients. Is that ok?

As far as I see we could already close #5428 - at least on develop is already working.

About this, yes, thanks, I closed it.

@Leusev Leusev self-requested a review June 3, 2020 09:42
Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

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

Could you solve that changelog conflict please?
Thanks!

@jesusdb
Copy link
Copy Markdown
Contributor Author

jesusdb commented Jun 3, 2020

@Leusev sure! I'll just wait first for @andreslucena's feedback

@andreslucena
Copy link
Copy Markdown
Member

Hi @andreslucena, this is because we're fixing the error from one of our clients. Is that ok?

Ok

@jesusdb jesusdb requested a review from Leusev June 3, 2020 10:30
Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

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

All ok now @jesusdb

Copy link
Copy Markdown
Contributor

@ivan-mr ivan-mr left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks!

@ivan-mr ivan-mr merged commit e3d67f3 into 0.21-stable Jun 3, 2020
@ivan-mr ivan-mr deleted the backport/fix-adding-components-without-step-config branch June 3, 2020 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants