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

Update decidim to bcn/0.28-branch branch #563

Merged
merged 23 commits into from
Oct 17, 2024
Merged

Update decidim to bcn/0.28-branch branch #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
88aa054
update gem and dependencies
davidbeig Oct 11, 2024
9684d10
apply decidim upgrade
davidbeig Oct 11, 2024
a938ccb
apply migrations
davidbeig Oct 11, 2024
d4b6ac1
add packages folder
davidbeig Oct 11, 2024
1d5e34d
update ubuntu-lates to ubuntu:22.04
davidbeig Oct 11, 2024
c1c7cf8
set versions of rubocop-factory_bot and rubocop-rspec
davidbeig Oct 11, 2024
f49d586
change decidim to fork in ajuntamentdebarcelona org
davidbeig Oct 14, 2024
875789d
apply decidim upgrade
davidbeig Oct 14, 2024
f71a4e2
add decidim internal evaluation module
davidbeig Oct 15, 2024
9da664e
add new migrations
davidbeig Oct 15, 2024
7fac44e
apply fix to create default proposal states
davidbeig Oct 15, 2024
93da45c
upgrade db/schema
davidbeig Oct 15, 2024
1be945d
remove rubocop-rspec and rubocop-factory_bot from gemfile
davidbeig Oct 15, 2024
af008a5
recover punycode: false from webpack custom configuration
davidbeig Oct 15, 2024
3162453
add rubocop-rspec and rubocop-factory_bot to gemfile
davidbeig Oct 15, 2024
5f3f9bc
fix ffi version to 1.16.3 due to incompatibility with rubygems
davidbeig Oct 15, 2024
1411df5
go back to previous package.json file and lock
davidbeig Oct 15, 2024
5ffa386
remove packages folder
davidbeig Oct 15, 2024
7b16953
go back to previous package-lock.json
davidbeig Oct 15, 2024
8d135bb
set wkhtmltopdf-binary to 0.12.6.6
davidbeig Oct 15, 2024
a44bf69
add missing locales in ca and es for module internal evaluation
davidbeig Oct 15, 2024
55c60d2
explicit decidim-templates in Gemfile
davidbeig Oct 15, 2024
3d51dee
update decidim dependency
davidbeig Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading