Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport "Fix decidim-templates gem definition to include templates migrations" to v0.23 #6900

Merged
merged 3 commits into from
Nov 25, 2020

Conversation

microstudi
Copy link
Contributor

🎩 What? Why?

Backport #6899 to 0.23.

Requires to upload a new gem version to rubygems.org. Should I bump the version in this PR to 0.23.2 @tramuntanal ?

📌 Related Issues

Link your PR to an issue

Testing

Describe the best way to test or validate your PR.

📋 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!

@microstudi microstudi changed the title fix gem definition to include templates migrations Backport gem definition to include templates migrations Nov 20, 2020
@tramuntanal tramuntanal changed the title Backport gem definition to include templates migrations Backport "Fix decidim-templates gem definition to include templates migrations" to v0.23 Nov 24, 2020
@tramuntanal
Copy link
Contributor

@microstudi erb linter crashes due to

NameError: uninitialized constant BetterHtml::Parser::HtmlError
Did you mean?  HtmlTokenizer

@microstudi
Copy link
Contributor Author

@microstudi erb linter crashes due to

NameError: uninitialized constant BetterHtml::Parser::HtmlError
Did you mean?  HtmlTokenizer

This happenning in all 0.23 backports, it seems that erblin 0.0.30 is broken.

@tramuntanal
Copy link
Contributor

The erb-lint problem has been solved here: Shopify/erb-lint#167, upgrading to v0.0.35 should solve the issue

@tramuntanal
Copy link
Contributor

tramuntanal commented Nov 24, 2020

erb-lint should be >= v0.0.33 @microstudi

@microstudi
Copy link
Contributor Author

@tramuntanal I've tried to upgrade erb-lint but it is a mess, it forces you to upgrade rubocop, which in turn has lots of new changes, which forces to modify a bunch of existing files in the code...
I don't know if it's worthy, and I don't think it's in the scope of this PR. Shouldn't be a maintenance PR to do that ?

This reverts commit 6ab54aa.
@tramuntanal
Copy link
Contributor

Merging as the erb-linter error is not related with this PR and it doesn't change any erb file

@tramuntanal tramuntanal merged commit 1c93ab1 into release/0.23-stable Nov 25, 2020
@tramuntanal tramuntanal deleted the backport/gem-templates-definition branch November 25, 2020 07:25
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.

None yet

2 participants