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.

Sign up for GitHub

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

Jump to bottom

Update to [email protected] #52

Merged
merged 11 commits into from
Nov 4, 2020
Merged

Update to [email protected] #52

merged 11 commits into from
Nov 4, 2020

Conversation

mllocs
Copy link
Contributor

@mllocs mllocs commented Oct 27, 2020 •
edited
Loading

@mllocs mllocs requested a review from sauloperez October 27, 2020 14:47
sauloperez
sauloperez reviewed Oct 27, 2020
View reviewed changes
Gemfile Outdated Show resolved Hide resolved
@mllocs mllocs temporarily deployed to decidim-coopcat October 29, 2020 14:55 Inactive
@sauloperez sauloperez temporarily deployed to decidim-coopcat October 30, 2020 09:32 Inactive
@mllocs mllocs temporarily deployed to decidim-coopcat November 2, 2020 10:04 Inactive
@mllocs mllocs temporarily deployed to decidim-coopcat November 2, 2020 10:15 Inactive
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 2, 2020 13:30 Inactive
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 2, 2020 16:59 Inactive
sauloperez
sauloperez reviewed Nov 3, 2020
View reviewed changes
Gemfile Outdated Show resolved Hide resolved
@sauloperez
Copy link
Contributor

sauloperez commented Nov 3, 2020 •
edited
Loading

We were just discussing with @mllocs how we'll approach the upgrade and its dependencies once we approve the changes:

  • action_delegator: we'll merge the upgrade to master and revert this Gemfile to it. We don't want to maintain a separate release/0.22-stable branch so we don't end up with a develop-master git flow and we don't plan to support 0.21.0
  • direct_verifications: we'll merge our PR that updates the min version into devel and get our Gemfile to point back to it.

Then, we'll need to update the Gemfile so we pick up the new commits.

@sauloperez sauloperez temporarily deployed to decidim-coopcat November 3, 2020 13:54 Inactive
@sauloperez sauloperez temporarily deployed to cercles-coop November 3, 2020 14:07 Inactive
@mllocs mllocs temporarily deployed to decidim-coopcat November 3, 2020 15:06 Inactive
@sauloperez
Toggle force_ssl depending on ENV var
d7d8b65 
This adapts our FORCE_SSL flag to work on v0.22.0. In a8ff96b75 they
forced this Rails setting app-wide in decidim-core's engine but giving
the option to toggle it on/off using Decidim's config object in
a config/initializer.
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 4, 2020 08:05 Inactive
@sauloperez
Use branch with backport
6d798ed 
So we can test things until the backport gets merged.
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 4, 2020 09:21 Inactive
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 4, 2020 10:50 Inactive
@sauloperez sauloperez force-pushed the feature/decidim-0.22 branch from 254ef00 to 761dbbf Compare November 4, 2020 11:13
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 4, 2020 11:16 Inactive
@sauloperez sauloperez force-pushed the feature/decidim-0.22 branch from 761dbbf to 77c82f6 Compare November 4, 2020 11:25
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 4, 2020 11:45 Inactive
@sauloperez sauloperez temporarily deployed to decidim-coopcat November 4, 2020 11:48 Inactive
@sauloperez
Revert back to action_delegator's master branch
54a3b08 
It does now have support for Decidim 0.22 after
coopdevs/decidim-module-action_delegator#65 got
merged.
@sauloperez sauloperez force-pushed the feature/decidim-0.22 branch from b75d6aa to 54a3b08 Compare November 4, 2020 12:10
@sauloperez sauloperez merged commit 082b898 into master Nov 4, 2020
@sauloperez sauloperez deleted the feature/decidim-0.22 branch November 4, 2020 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sauloperez sauloperez sauloperez left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade to Decidim 0.22.0
2 participants
@mllocs @sauloperez