Skip to content

Commit

Permalink
Update decidim to bcn/0.28-branch branch (#563)
Browse files Browse the repository at this point in the history
* update gem and dependencies

* apply decidim upgrade

* apply migrations

* add packages folder

* update ubuntu-lates to ubuntu:22.04

* set versions of rubocop-factory_bot and rubocop-rspec

* change decidim to fork in ajuntamentdebarcelona org

* apply decidim upgrade

* add decidim internal evaluation module

* add new migrations

* apply fix to create default proposal states

* upgrade db/schema

* remove rubocop-rspec and rubocop-factory_bot from gemfile

* recover punycode: false from webpack custom configuration

* add rubocop-rspec and rubocop-factory_bot to gemfile

* fix ffi version to 1.16.3 due to incompatibility with rubygems

* go back to previous package.json file and lock

* remove packages folder

* go back to previous package-lock.json

* set wkhtmltopdf-binary to 0.12.6.6

* add missing locales in ca and es for module internal evaluation

* explicit decidim-templates in Gemfile

* update decidim dependency
  • Loading branch information
davidbeig authored Oct 17, 2024
1 parent 7f18869 commit f778abc
Show file tree
Hide file tree
Showing 20 changed files with 636 additions and 300 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
lint:
name: Lint code
runs-on: ubuntu-latest
runs-on: ubuntu:22.04
env:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu:22.04
services:
postgres:
image: postgres:11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_census_sms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Census SMS
runs-on: ubuntu-latest
runs-on: ubuntu:22-04
services:
postgres:
image: postgres:11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_stats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Stats
runs-on: ubuntu-latest
runs-on: ubuntu:22.04
services:
postgres:
image: postgres:11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_valid_auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Valid Auth
runs-on: ubuntu-latest
runs-on: ubuntu:22-04
services:
postgres:
image: postgres:11
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

source "https://rubygems.org"

DECIDIM_VERSION = "0.28.3"
DECIDIM_VERSION = "0.28.4"

ruby RUBY_VERSION

gem "decidim", DECIDIM_VERSION
# gem "decidim", DECIDIM_VERSION
gem "decidim", github: "ajuntamentdeBarcelona/decidim", branch: "bcn/0.28-branch"
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-internal_evaluation", github: "AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
gem "decidim-sortitions", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

gem "decidim-census_sms", path: "decidim-census_sms"
gem "decidim-dataviz", path: "decidim-dataviz"
Expand Down
Loading

0 comments on commit f778abc

Please sign in to comment.