Skip to content

Commit

Permalink
Bump decidim from v0.28.1 to v0.29.0.rc3 (#129)
Browse files Browse the repository at this point in the history
* Bump decidim from v0.28.1 to v0.29.0.rc2

* Bump ruby version in GH Action workflow configuration

* Remove proposal states hack

In v0.29 we have native support for this customization.

* Workaround missing require in decidim-dev

* Fix specs

* Remove unmaintained @decidim/elections npm package

* Regenerate package-lock.json

For some reason `npm uninstall` has broken the Javascript code.

This PR fixes it by fully rebuilding the package-lock.json.

* Update db/migrate/20240717080156_add_withdrawn_at_field_to_proposals.decidim_proposals.rb

Co-authored-by: Alexandru Emil Lupu <[email protected]>

* Bump decidim from v0.29.0.rc2 to v0.29.0.rc3

* Remove unecessary requirement for v0.29.0.rc3 (fixed upstream)

---------

Co-authored-by: Fran Bolívar <[email protected]>
Co-authored-by: Alexandru Emil Lupu <[email protected]>
  • Loading branch information
3 people authored Jul 24, 2024
1 parent 3adbf58 commit 74da377
Show file tree
Hide file tree
Showing 187 changed files with 11,835 additions and 18,454 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/decidim_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "[CI] Decidim"
on: [push]

env:
RUBY_VERSION: 3.1.1
RUBY_VERSION: 3.2.2
NODE_VERSION: 18.17.1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.1
3.2.2
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ source "https://rubygems.org"

ruby RUBY_VERSION

# DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.28-stable" }
DECIDIM_VERSION = "0.28.1"
# DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.29-stable" }
DECIDIM_VERSION = "0.29.0.rc3"

gem "decidim", DECIDIM_VERSION
gem "decidim-initiatives", DECIDIM_VERSION
Expand Down
Loading

0 comments on commit 74da377

Please sign in to comment.