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

Upgrade Decidim to v0.27 #490

Merged
merged 85 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
430ca5d
Upgrade Decidim and Ruby
laurajaime Jul 10, 2024
a302722
Webpacker install
laurajaime Jul 10, 2024
4d6284c
Update secrets.yml and decidim config
laurajaime Jul 10, 2024
85554cc
Update some external modules
laurajaime Jul 10, 2024
1eff417
Compile webpacker
laurajaime Jul 11, 2024
b6dce69
decidim-home: update Gemfile.lock
laurajaime Jul 11, 2024
37af909
Review app decorators
laurajaime Jul 11, 2024
7d08066
Changes in overrided login views
laurajaime Jul 11, 2024
aaa7d3c
Update assemblies locales
laurajaime Jul 11, 2024
b9a119e
Update decidim-home and decidim-type modules
laurajaime Jul 11, 2024
23687d1
Update decidim-top_comments module
laurajaime Jul 11, 2024
052f842
Update decidim-recaptcha module
laurajaime Jul 11, 2024
2391c0b
Update decidim-process-extended module
laurajaime Jul 11, 2024
7e87f02
Update decidim-regulations module
laurajaime Jul 11, 2024
08fd7eb
Update HOW TO UPGRADE
laurajaime Jul 11, 2024
89b6115
Upgrade decidim-verifications-members_picker with temporal branch
laurajaime Jul 11, 2024
700961d
Upgrade Ruby version in GH workflow
laurajaime Jul 11, 2024
5e316e5
Add department admin v027 and fix duplicated description
laurajaime Jul 17, 2024
518d74e
Add chromedriver workaround
laurajaime Jul 17, 2024
d787650
Refactor decorator
laurajaime Jul 17, 2024
284f095
Upgrade to Decidim v0.27.7
laurajaime Jul 18, 2024
7dfe32d
Refactor decorators and add missing field in form
laurajaime Jul 18, 2024
ff5da3d
Fix process extended tests
laurajaime Jul 18, 2024
580fd4b
Rubocopify
laurajaime Jul 18, 2024
f422b75
Fix main tests
laurajaime Jul 18, 2024
0fc1171
WIP
laurajaime Jul 18, 2024
127991f
Rework decorators
laurajaime Jul 23, 2024
cf638e7
Remove decidim-type and decidim-admin-extended modules
laurajaime Jul 30, 2024
ff0c4b5
Rework types filter
laurajaime Jul 30, 2024
f10c3d9
Remove require
laurajaime Jul 31, 2024
f5b1052
Add migration to move types and fix filter
laurajaime Jul 31, 2024
e11d743
Fix tests
laurajaime Jul 31, 2024
0176042
Update to Decidim 0.27.8
laurajaime Jul 31, 2024
8b2138d
Fix tests
laurajaime Jul 31, 2024
a1c31a0
Add capybara screenshots
laurajaime Jul 31, 2024
572e7ed
Changes in test
laurajaime Jul 31, 2024
8d6587a
Change gems versions
laurajaime Aug 26, 2024
0a8885d
Bump versions and fix overrides
laurajaime Aug 26, 2024
3729543
Recover decidim type model for migration
laurajaime Aug 27, 2024
a0f74f5
Comment types decorators
laurajaime Aug 27, 2024
35c706a
Rubocopify
laurajaime Aug 27, 2024
6c2192a
Remove decidim_type model
laurajaime Aug 28, 2024
30f9bdd
Set department admin correct gem tag
laurajaime Aug 30, 2024
d3223d9
Fix department admin decorator error
laurajaime Sep 4, 2024
8590a94
Upgrade department admin
laurajaime Sep 4, 2024
122d641
Fix decorators in lib folder
laurajaime Sep 4, 2024
af639cb
Set department admin correct gem tag
laurajaime Sep 5, 2024
faddc17
Fix mailer sender
laurajaime Sep 5, 2024
9b729bb
Fix filter in regulations
laurajaime Sep 5, 2024
015f36e
Fix filter by type
laurajaime Sep 5, 2024
4a41a86
Add migration to change types in processes
laurajaime Sep 5, 2024
ae69b64
Fix export PDFs because wicked_pdf version
laurajaime Sep 5, 2024
6e12784
Rubocopify
laurajaime Sep 5, 2024
1f7b0d9
Fix tests
laurajaime Sep 5, 2024
ba5a083
Changes in migration
laurajaime Sep 6, 2024
6f1df05
Fix timezone
laurajaime Sep 9, 2024
169f454
Add missing translation in upload file
laurajaime Sep 12, 2024
59849df
Fix import process and bump main Decidim to 0.27.9
laurajaime Sep 12, 2024
ad099ce
Upgrade all to Decidim 0.27.9
laurajaime Sep 12, 2024
a1f3fcf
Rubocopify
laurajaime Sep 12, 2024
2f93fcb
Fix tests
laurajaime Sep 12, 2024
81c9cc8
Add validate migrations to CI
tramuntanal Sep 13, 2024
116a5f8
Refactor process serializers
laurajaime Sep 13, 2024
3c68815
Merge branch 'upgrade/0.27' of github.com:gencat/participa into upgra…
laurajaime Sep 13, 2024
e4e400f
Change Ruby version in validate migrations
laurajaime Sep 13, 2024
b6be642
Fix tests
laurajaime Sep 13, 2024
887bcb5
Jointly notify the import of proposals and answers
ivan-mr Sep 25, 2024
6e525e3
Add modifications on code according to review suggestions
ivan-mr Sep 25, 2024
3f68bf6
Merge branch 'upgrade/0.27' into feat/unified_notification_on_propose…
ivan-mr Sep 25, 2024
340e332
Modify decorators to updated version of zeitwek
ivan-mr Sep 25, 2024
02d8c38
Refactor importer decorator spec to avoid rubocop issue stub methods
ivan-mr Sep 25, 2024
1ae8ca0
Add schema update
ivan-mr Sep 25, 2024
59883ac
Refactor decorators to avoid rubocop issue stub methods
ivan-mr Sep 25, 2024
4766646
Fix validate migrations CI
laurajaime Sep 25, 2024
81ab4e3
Add missing migrations
laurajaime Sep 25, 2024
620b346
Merge branch 'upgrade/0.27' into feat/unified_notification_on_propose…
ivan-mr Sep 25, 2024
88bb162
Unify syntax for proposal_creator_decorator_spec
ivan-mr Sep 25, 2024
9ce5c6e
Modify mailer sender default
ivan-mr Sep 26, 2024
0483f33
Modifying mailer to on answers importer
ivan-mr Sep 26, 2024
6d749b1
Remove publish for every proposal import process
ivan-mr Sep 26, 2024
1a512be
Merge pull request #495 from gencat/feat/unified_notification_on_prop…
ivan-mr Oct 7, 2024
482d00c
Add reminders task to schedule
laurajaime Oct 17, 2024
0ffec8d
Merge branch 'upgrade/0.27' of github.com:gencat/participa into upgra…
laurajaime Oct 17, 2024
03ad512
Upgrade decidim-cdtb
tramuntanal Oct 18, 2024
0fbbe6a
Fix JS compilation
tramuntanal Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 18 additions & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.7

jobs:
test-report:
Expand Down Expand Up @@ -37,6 +37,23 @@ jobs:
- name: Set bundle local config configvendor/bundle path
run: bundle config set --local path 'vendor/bundle'

# chromedriver workaround
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
shell: "bash"
run: apt list --installed | grep chrome

- name: Remove Chrome
shell: "bash"
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- name: Install Ruby deps
uses: nick-invision/retry@v2
with:
Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/test-process_extended.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.7

jobs:
test-report:
Expand Down Expand Up @@ -52,6 +52,23 @@ jobs:
- name: Set bundle local config configvendor/bundle path
run: bundle config set --local path 'vendor/bundle'

# chromedriver workaround
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
shell: "bash"
run: apt list --installed | grep chrome

- name: Remove Chrome
shell: "bash"
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- name: Install Ruby deps
uses: nick-invision/retry@v2
with:
Expand All @@ -65,7 +82,6 @@ jobs:
cd decidim-process-extended
bundle exec rake decidim:generate_external_test_app
cd spec/decidim_dummy_app/
bundle exec rake decidim_type:install:migrations
bundle exec rake decidim_process_extended:install:migrations
RAILS_ENV=test bundle exec rails db:migrate

Expand Down
19 changes: 18 additions & 1 deletion .github/workflows/test-recaptcha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.7

jobs:
test-report:
Expand Down Expand Up @@ -52,6 +52,23 @@ jobs:
- name: Set bundle local config configvendor/bundle path
run: bundle config set --local path 'vendor/bundle'

# chromedriver workaround
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
shell: "bash"
run: apt list --installed | grep chrome

- name: Remove Chrome
shell: "bash"
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- name: Install Ruby deps
uses: nick-invision/retry@v2
with:
Expand Down
19 changes: 18 additions & 1 deletion .github/workflows/test-top_comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.7

jobs:
test-report:
Expand Down Expand Up @@ -52,6 +52,23 @@ jobs:
- name: Set bundle local config configvendor/bundle path
run: bundle config set --local path 'vendor/bundle'

# chromedriver workaround
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
shell: "bash"
run: apt list --installed | grep chrome

- name: Remove Chrome
shell: "bash"
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- name: Install Ruby deps
uses: nick-invision/retry@v2
with:
Expand Down
32 changes: 31 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.7
NODE_VERSION: 16.9.1

jobs:
Expand Down Expand Up @@ -62,6 +62,23 @@ jobs:
- name: Set bundle local config configvendor/bundle path
run: bundle config set --local path 'vendor/bundle'

# chromedriver workaround
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
shell: "bash"
run: apt list --installed | grep chrome

- name: Remove Chrome
shell: "bash"
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- name: Install Ruby deps
uses: nick-invision/retry@v2
with:
Expand All @@ -82,3 +99,16 @@ jobs:
max_attempts: 3
retry_on: error
command: CI=1 RAILS_ENV=test bundle exec rspec --backtrace

# Prepare screenshots for upload
- name: Prepare screenshots for upload
run: RAILS_ENV=test bundle exec rails ci:screenshots:rename
if: always()

# Upload screenshots artifact
- name: Upload screenshots
uses: actions/upload-artifact@v3
if: always()
with:
name: screenshot_artifact
path: /home/runner/work/participa/participa/tmp/screenshots/
67 changes: 67 additions & 0 deletions .github/workflows/validate_migrations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: "[CI] Validate migrations"

on:
push:
branches:
- master
- release/*
- "*-stable"
pull_request:

env:
DB_DATABASE: app
DB_USERNAME: postgres
DB_PASSWORD: postgres
RUBY_VERSION: 3.0.7

jobs:
test:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:11
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
env:
POSTGRES_PASSWORD: postgres
env:
DB_DATABASE: app
DB_USERNAME: postgres
DB_PASSWORD: postgres
DB_HOST: localhost
SECRET_KEY_BASE: "secret_key_base"

steps:
- uses: actions/[email protected]
with:
fetch-depth: 1
- uses: ruby/setup-ruby@master
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true
- name: Recover Ruby dependency cache
uses: actions/cache@v1
with:
path: ./vendor/bundle
key: ${{ runner.OS }}-app-rubydeps-${{ hashFiles('Gemfile.lock') }}
restore-keys: |
${{ runner.OS }}-app-rubydeps-${{ env.cache-name }}-
${{ runner.OS }}-app-rubydeps-

- name: Set bundle local config vendor/bundle path
run: bundle config set --local path 'vendor/bundle'

- name: Install Ruby deps
uses: nick-invision/retry@v2
with:
timeout_minutes: 10
max_attempts: 3
retry_on: error
command: bundle install --jobs 4 --retry 3

- name: Run specs
run: bin/rails cdtb:upgrades:validate_migrations
17 changes: 9 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
!/log/.keep
!/tmp/.keep

/node_modules
node_modules/

yarn.lock
/yarn-error.log
yarn-debug.log*
.yarn-integrity

.byebug_history

Expand All @@ -29,6 +31,12 @@ public/uploads
# Ignore public/assets as assets are generated in each server when deploying
public/assets

/public/packs
/public/packs-test
public/decidim-packs/
public/sw.js.*
public/sw.js

# Ignore test app
spec/decidim_dummy_app/
.rspec-failures
Expand All @@ -39,10 +47,3 @@ spec/decidim_dummy_app/

coverage/
storage/

/public/packs
/public/packs-test
public/decidim-packs/

yarn-debug.log*
.yarn-integrity
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.0.7
24 changes: 15 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,27 @@
source "https://rubygems.org"

ruby RUBY_VERSION
DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", branch: "release/0.26-stable" }.freeze
DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", branch: "release/0.27-stable" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

#### Custom gems and modifications block start ####
gem "decidim-admin-extended", path: "decidim-admin-extended"
gem "decidim-home", path: "decidim-home"
gem "decidim-process-extended", path: "decidim-process-extended"
gem "decidim-recaptcha", path: "decidim-recaptcha"
gem "decidim-regulations", path: "decidim-regulations"
gem "decidim-top_comments", path: "decidim-top_comments"
gem "decidim-type", path: "decidim-type"

gem "decidim-cdtb", git: "https://github.com/CodiTramuntana/decidim-module-cdtb.git", branch: "main"
gem "decidim-challenges", git: "https://github.com/gencat/decidim-module-challenges.git", tag: "v0.2.0"
gem "decidim-department_admin", git: "https://github.com/gencat/decidim-module-department_admin.git", tag: "v6.0.0"
gem "decidim-idcat_mobil", "~> 0.3.0"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "release/0.26-stable"
gem "decidim-cdtb"
gem "decidim-challenges", git: "https://github.com/gencat/decidim-module-challenges.git", tag: "v0.3.3"
gem "decidim-department_admin", git: "https://github.com/gencat/decidim-module-department_admin.git", tag: "v0.7.1"
gem "decidim-idcat_mobil"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "release/0.27-stable"

gem "decidim-verifications-members_picker", git: "https://github.com/gencat/decidim-verifications-members_picker.git", tag: "0.0.6"
#### Custom gems and modifications block end ####

gem "decidim-verifications-members_picker", git: "https://github.com/gencat/decidim-verifications-members_picker.git", tag: "0.0.4"
gem "soda-ruby", require: false

gem "puma"
Expand All @@ -39,6 +38,12 @@ gem "whenever", require: false

gem "recaptcha"

# Error uninitialized constant WickedPdf::WickedPdfHelper::Assets::SprocketsEnvironment::Sprockets
# in update to 2.8.0
# https://github.com/mileszs/wicked_pdf/issues/1102

gem "wicked_pdf", "~> 2.7.0"

group :development, :test do
gem "bootsnap"
gem "byebug", platform: :mri
Expand All @@ -57,5 +62,6 @@ group :development do
end

group :test do
gem "capybara-screenshot"
gem "database_cleaner"
end
Loading
Loading