diff --git a/.github/workflows/ci_cleaner.yml b/.github/workflows/ci_cleaner.yml
index 12d23bf..dfdf5db 100644
--- a/.github/workflows/ci_cleaner.yml
+++ b/.github/workflows/ci_cleaner.yml
@@ -4,8 +4,8 @@ on: [push]
env:
CI: "true"
CODECOV: "true"
- RUBY_VERSION: 3.2.2
- NODE_VERSION: 18.17.1
+ RUBY_VERSION: 3.3.4
+ NODE_VERSION: 22.14.0
SHAKAPACKER_RUNTIME_COMPILE: "false"
RAILS_ENV: test
DISABLE_SPRING: "true"
@@ -27,7 +27,7 @@ jobs:
timeout-minutes: 30
services:
postgres:
- image: postgres:11
+ image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
@@ -45,42 +45,79 @@ jobs:
if: "github.ref != 'refs/heads/develop'"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- - uses: OpenSourcePolitics/rspec-action@master
+ - uses: actions/checkout@v4
with:
- command: "bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'"
- system_tests:
- name: System tests
+ fetch-depth: 1
+ - uses: ruby/setup-ruby@v1
+ with:
+ bundler-cache: true
+ - run: sudo apt install imagemagick
+ name: Install imagemagick
+ - run: bundle exec rake test_app
+ name: Create test app
+ - run: |
+ rm -f ./spec/decidim_dummy_app/app/services/dummy_signature_handler.rb
+ rm -f ./spec/decidim_dummy_app/app/services/dummy_sms_mobile_phone_validator.rb
+ name: Remove Initiative-dependent dummy files
+ - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
+ name: Create the screenshots folder
+ - uses: nanasess/setup-chromedriver@v2
+ - name: Run precompile if needed
+ run: |
+ if [[ -d "app/views" ]] || [[ -d "spec/mailers" ]] || [[ -d "spec/system" ]]; then
+ cd "spec/decidim_dummy_app"
+ bundle exec rails assets:precompile
+ else
+ echo "No need to precompile assets since system folder is empty"
+ fi
+ - run: bundle exec rspec
+ name: RSpec
+ - uses: codecov/codecov-action@v3
+ - uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: screenshots
+ path: ./spec/decidim_dummy_app/tmp/screenshots
+ if-no-files-found: ignore
+ release:
+ if: "github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'"
+ needs: [ tests, lint ]
runs-on: ubuntu-latest
- timeout-minutes: 30
- 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:
- DATABASE_USERNAME: postgres
- DATABASE_PASSWORD: postgres
- DATABASE_HOST: localhost
steps:
- - uses: rokroskar/workflow-run-cleanup-action@v0.3.0
- if: "github.ref != 'refs/heads/develop'"
- env:
- GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- - uses: OpenSourcePolitics/rspec-action@master
+ - uses: actions/checkout@v4
with:
- command: "bundle exec rspec spec/system"
+ fetch-depth: 1
+ - uses: ruby/setup-ruby@v1
+ with:
+ bundler-cache: true
+ - name: Setup git and gh
+ run: |
+ git config user.name "${GITHUB_ACTOR}"
+ git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+ echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+ - run: gem install parse_gemspec-cli
+ name: Intall gem parser
+ - run: echo "::set-output name=tag::$(parse-gemspec-cli *.gemspec | jq .'version')"
+ name: Set tag version
+ id: set_tag
+ - name: Add tag and push
+ run: |
+ git tag
+ git push --tags
+ - name: Create release
+ run: gh release create ${{ steps.set_tag.outputs.tag }} --generate-notes
publish:
- if: "github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release' )"
- needs: [tests, system_tests, lint]
+ needs: release
runs-on: ubuntu-latest
steps:
- - uses: OpenSourcePolitics/publish-gem-action@master
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- rubygems_api_key: ${{ secrets.RUBYGEMS_API_KEY }}
+ - uses: actions/checkout@v4
+ - name: Publish to RubyGems
+ run: |
+ mkdir -p $HOME/.gem
+ touch $HOME/.gem/credentials
+ chmod 0600 $HOME/.gem/credentials
+ printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+ gem build *.gemspec
+ gem push *.gem
+ env:
+ GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"
diff --git a/.rubocop.yml b/.rubocop.yml
index 4d75286..86eb4a3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,12 @@
-require: rubocop-factory_bot
+plugins:
+ - rubocop-factory_bot
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
AllCops:
- TargetRubyVersion: 3.1
+ TargetRubyVersion: 3.3
Include:
- "**/*.rb"
- "**/*.rake"
diff --git a/.rubocop_rails.yml b/.rubocop_rails.yml
index 19de2a7..2d81eff 100644
--- a/.rubocop_rails.yml
+++ b/.rubocop_rails.yml
@@ -1,4 +1,5 @@
-require: rubocop-rails
+plugins:
+ - rubocop-rails
Rails:
Enabled: true
@@ -93,4 +94,4 @@ Rails/Validation:
- decidim-*/app/models/**/*.rb
FactoryBot/FactoryAssociationWithStrategy:
- Enabled: false
\ No newline at end of file
+ Enabled: false
diff --git a/.rubocop_ruby.yml b/.rubocop_ruby.yml
index 02b35ab..3081060 100644
--- a/.rubocop_ruby.yml
+++ b/.rubocop_ruby.yml
@@ -1,4 +1,4 @@
-require:
+plugins:
- rubocop-rspec
- rubocop-faker
@@ -68,7 +68,7 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
- TargetRubyVersion: 2.7
+ TargetRubyVersion: 3.3.4
# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
@@ -793,7 +793,7 @@ Style/PercentQLiterals:
Style/SlicingWithRange:
Enabled: false
-Naming/PredicateName:
+Naming/PredicatePrefix:
# Predicate name prefixes.
NamePrefix:
- is_
diff --git a/.ruby-version b/.ruby-version
index be94e6f..a0891f5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.4
diff --git a/Gemfile b/Gemfile
index 237b072..f125aef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
ruby RUBY_VERSION
-gem "decidim", "~> 0.29.1"
+gem "decidim", "~> 0.31.0"
gem "decidim-cleaner", path: "."
gem "bootsnap", "~> 1.4"
@@ -12,7 +12,7 @@ gem "puma", ">= 6.3.1"
group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
- gem "decidim-dev", "~> 0.29.1"
+ gem "decidim-dev", "~> 0.31.0"
gem "rubocop-rails", "~> 2.25"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d1d085..6e45cd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,103 +1,112 @@
PATH
remote: .
specs:
- decidim-cleaner (5.0.0)
- decidim-core (~> 0.29.0)
+ decidim-cleaner (5.1.0)
+ decidim-core (~> 0.31.0)
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.0.8.7)
- actionpack (= 7.0.8.7)
- activesupport (= 7.0.8.7)
+ actioncable (7.2.3)
+ actionpack (= 7.2.3)
+ activesupport (= 7.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (7.0.8.7)
- actionpack (= 7.0.8.7)
- activejob (= 7.0.8.7)
- activerecord (= 7.0.8.7)
- activestorage (= 7.0.8.7)
- activesupport (= 7.0.8.7)
- mail (>= 2.7.1)
- net-imap
- net-pop
- net-smtp
- actionmailer (7.0.8.7)
- actionpack (= 7.0.8.7)
- actionview (= 7.0.8.7)
- activejob (= 7.0.8.7)
- activesupport (= 7.0.8.7)
- mail (~> 2.5, >= 2.5.4)
- net-imap
- net-pop
- net-smtp
- rails-dom-testing (~> 2.0)
- actionpack (7.0.8.7)
- actionview (= 7.0.8.7)
- activesupport (= 7.0.8.7)
- rack (~> 2.0, >= 2.2.4)
+ zeitwerk (~> 2.6)
+ actionmailbox (7.2.3)
+ actionpack (= 7.2.3)
+ activejob (= 7.2.3)
+ activerecord (= 7.2.3)
+ activestorage (= 7.2.3)
+ activesupport (= 7.2.3)
+ mail (>= 2.8.0)
+ actionmailer (7.2.3)
+ actionpack (= 7.2.3)
+ actionview (= 7.2.3)
+ activejob (= 7.2.3)
+ activesupport (= 7.2.3)
+ mail (>= 2.8.0)
+ rails-dom-testing (~> 2.2)
+ actionpack (7.2.3)
+ actionview (= 7.2.3)
+ activesupport (= 7.2.3)
+ cgi
+ nokogiri (>= 1.8.5)
+ racc
+ rack (>= 2.2.4, < 3.3)
+ rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (7.0.8.7)
- actionpack (= 7.0.8.7)
- activerecord (= 7.0.8.7)
- activestorage (= 7.0.8.7)
- activesupport (= 7.0.8.7)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ useragent (~> 0.16)
+ actiontext (7.2.3)
+ actionpack (= 7.2.3)
+ activerecord (= 7.2.3)
+ activestorage (= 7.2.3)
+ activesupport (= 7.2.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.0.8.7)
- activesupport (= 7.0.8.7)
+ actionview (7.2.3)
+ activesupport (= 7.2.3)
builder (~> 3.1)
- erubi (~> 1.4)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
+ cgi
+ erubi (~> 1.11)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
active_link_to (1.0.5)
actionpack
addressable
- activejob (7.0.8.7)
- activesupport (= 7.0.8.7)
+ activejob (7.2.3)
+ activesupport (= 7.2.3)
globalid (>= 0.3.6)
- activemodel (7.0.8.7)
- activesupport (= 7.0.8.7)
- activerecord (7.0.8.7)
- activemodel (= 7.0.8.7)
- activesupport (= 7.0.8.7)
- activestorage (7.0.8.7)
- actionpack (= 7.0.8.7)
- activejob (= 7.0.8.7)
- activerecord (= 7.0.8.7)
- activesupport (= 7.0.8.7)
+ activemodel (7.2.3)
+ activesupport (= 7.2.3)
+ activerecord (7.2.3)
+ activemodel (= 7.2.3)
+ activesupport (= 7.2.3)
+ timeout (>= 0.4.0)
+ activestorage (7.2.3)
+ actionpack (= 7.2.3)
+ activejob (= 7.2.3)
+ activerecord (= 7.2.3)
+ activesupport (= 7.2.3)
marcel (~> 1.0)
- mini_mime (>= 1.1.0)
- activesupport (7.0.8.7)
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ activesupport (7.2.3)
+ base64
+ benchmark (>= 0.3)
+ bigdecimal
+ concurrent-ruby (~> 1.0, >= 1.3.1)
+ connection_pool (>= 2.2.5)
+ drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- tzinfo (~> 2.0)
- acts_as_list (1.2.4)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
+ acts_as_list (1.2.6)
activerecord (>= 6.1)
activesupport (>= 6.1)
- addressable (2.8.7)
- public_suffix (>= 2.0.2, < 7.0)
- ast (2.4.2)
- base64 (0.2.0)
- batch-loader (1.5.0)
- bcrypt (3.1.20)
- better_html (2.1.1)
- actionview (>= 6.0)
- activesupport (>= 6.0)
+ addressable (2.8.8)
+ public_suffix (>= 2.0.2, < 8.0)
+ ast (2.4.3)
+ base64 (0.3.0)
+ batch-loader (2.0.6)
+ bcrypt (3.1.21)
+ benchmark (0.5.0)
+ better_html (2.2.0)
+ actionview (>= 7.0)
+ activesupport (>= 7.0)
ast (~> 2.0)
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
- bigdecimal (3.1.9)
+ bigdecimal (4.0.1)
bindex (0.8.1)
- bootsnap (1.18.4)
+ bootsnap (1.20.1)
msgpack (~> 1.2)
- browser (2.7.1)
+ browser (6.2.0)
builder (3.3.0)
- bullet (7.1.6)
+ bullet (8.0.8)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
@@ -121,134 +130,151 @@ GEM
cells-rails (0.1.6)
actionpack (>= 5.0)
cells (>= 4.1.6, < 5.0.0)
+ cgi (0.5.1)
charlock_holmes (0.7.9)
+ chartkick (5.1.5)
childprocess (5.1.0)
logger (~> 1.5)
- commonmarker (0.23.11)
- concurrent-ruby (1.3.4)
- crack (1.0.0)
+ chunky_png (1.4.0)
+ cmdparse (3.0.7)
+ commonmarker (0.23.12)
+ concurrent-ruby (1.3.6)
+ connection_pool (3.0.2)
+ crack (1.0.1)
bigdecimal
rexml
crass (1.0.6)
- css_parser (1.21.0)
+ css_parser (1.21.1)
addressable
- csv (3.3.2)
- dartsass (1.49.8)
- date (3.4.1)
+ csv (3.3.5)
+ data_migrate (11.3.1)
+ activerecord (>= 6.1)
+ railties (>= 6.1)
+ date (3.5.1)
date_validator (0.12.0)
activemodel (>= 3)
activesupport (>= 3)
- decidim (0.29.1)
- decidim-accountability (= 0.29.1)
- decidim-admin (= 0.29.1)
- decidim-api (= 0.29.1)
- decidim-assemblies (= 0.29.1)
- decidim-blogs (= 0.29.1)
- decidim-budgets (= 0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- decidim-debates (= 0.29.1)
- decidim-forms (= 0.29.1)
- decidim-generators (= 0.29.1)
- decidim-meetings (= 0.29.1)
- decidim-pages (= 0.29.1)
- decidim-participatory_processes (= 0.29.1)
- decidim-proposals (= 0.29.1)
- decidim-sortitions (= 0.29.1)
- decidim-surveys (= 0.29.1)
- decidim-system (= 0.29.1)
- decidim-verifications (= 0.29.1)
- decidim-accountability (0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- decidim-admin (0.29.1)
+ decidim (0.31.0)
+ decidim-accountability (= 0.31.0)
+ decidim-admin (= 0.31.0)
+ decidim-api (= 0.31.0)
+ decidim-assemblies (= 0.31.0)
+ decidim-blogs (= 0.31.0)
+ decidim-budgets (= 0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-debates (= 0.31.0)
+ decidim-forms (= 0.31.0)
+ decidim-generators (= 0.31.0)
+ decidim-meetings (= 0.31.0)
+ decidim-pages (= 0.31.0)
+ decidim-participatory_processes (= 0.31.0)
+ decidim-proposals (= 0.31.0)
+ decidim-sortitions (= 0.31.0)
+ decidim-surveys (= 0.31.0)
+ decidim-system (= 0.31.0)
+ decidim-verifications (= 0.31.0)
+ decidim-accountability (0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-admin (0.31.0)
active_link_to (~> 1.0)
- decidim-core (= 0.29.1)
+ decidim-core (= 0.31.0)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0, >= 2.0.9)
- decidim-api (0.29.1)
- decidim-core (= 0.29.1)
- graphql (~> 2.2.6)
- graphql-docs (~> 4.0)
+ decidim-api (0.31.0)
+ decidim-core (= 0.31.0)
+ devise-jwt (~> 0.12.1)
+ graphql (~> 2.4.0, >= 2.4.17)
+ graphql-docs (~> 5.0)
rack-cors (~> 1.0)
- decidim-assemblies (0.29.1)
- decidim-core (= 0.29.1)
- decidim-blogs (0.29.1)
- decidim-admin (= 0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- decidim-budgets (0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- decidim-comments (0.29.1)
- decidim-core (= 0.29.1)
+ decidim-assemblies (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-blogs (0.31.0)
+ decidim-admin (= 0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-budgets (0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-comments (0.31.0)
+ decidim-core (= 0.31.0)
redcarpet (~> 3.5, >= 3.5.1)
- decidim-core (0.29.1)
+ decidim-core (0.31.0)
active_link_to (~> 1.0)
acts_as_list (~> 1.0)
- batch-loader (~> 1.2)
- browser (~> 2.7)
+ batch-loader (~> 2.0)
+ browser (~> 6.2.0)
cells-erb (~> 0.1.0)
cells-rails (~> 0.1.3)
charlock_holmes (~> 0.7)
+ chartkick (~> 5.1.2)
+ concurrent-ruby (~> 1.3.0)
+ data_migrate (~> 11.3)
date_validator (~> 0.12.0)
devise (~> 4.7)
- devise-i18n (~> 1.2, < 1.11.1)
+ devise-i18n (~> 1.2)
diffy (~> 3.3)
doorkeeper (~> 5.6, >= 5.6.6)
doorkeeper-i18n (~> 4.0)
file_validators (~> 3.0)
fog-local (~> 0.6)
- foundation_rails_helper (~> 4.0)
geocoder (~> 1.8)
hashdiff (>= 0.4.0, < 2.0.0)
+ hexapdf (~> 1.1.0)
image_processing (~> 1.2)
invisible_captcha (~> 0.12)
kaminari (~> 1.2, >= 1.2.1)
loofah (~> 2.19, >= 2.19.1)
mime-types (>= 1.16, < 4.0)
mini_magick (~> 4.9)
- net-smtp (~> 0.3.1)
+ net-smtp (~> 0.5.0)
nokogiri (~> 1.16, >= 1.16.2)
omniauth (~> 2.0)
omniauth-facebook (~> 5.0)
omniauth-google-oauth2 (~> 1.0)
omniauth-rails_csrf_protection (~> 1.0)
omniauth-twitter (~> 1.4)
- paper_trail (~> 12.0)
- pg (~> 1.4.0, < 2)
+ paper_trail (~> 16.0)
+ paranoia (~> 3.0.0)
+ pg (~> 1.5.0, < 2)
pg_search (~> 2.2)
premailer-rails (~> 1.10)
- psych (~> 4.0)
rack (~> 2.2, >= 2.2.8.1)
rack-attack (~> 6.0)
- rails (~> 7.0.8)
+ rails (~> 7.2.0, >= 7.2.2.2)
rails-i18n (~> 7.0)
- ransack (~> 3.2.1)
+ ransack (~> 4.2.0)
redis (~> 4.1)
- request_store (~> 1.5.0)
+ request_store (~> 1.7.0)
+ rqrcode (~> 2.2.0)
rubyXL (~> 3.4)
rubyzip (~> 2.0)
- shakapacker (~> 7.1.0)
- valid_email2 (~> 4.0)
+ shakapacker (~> 8.3.0)
+ valid_email2 (~> 7.0)
web-push (~> 3.0)
- wisper (~> 2.0)
- decidim-debates (0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- decidim-dev (0.29.1)
- bullet (~> 7.1.6)
+ wisper (~> 3.0)
+ decidim-debates (0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-dev (0.31.0)
+ bullet (~> 8.0.0)
byebug (~> 11.0)
capybara (~> 3.39)
- decidim (= 0.29.1)
- erb_lint (~> 0.4.0)
+ decidim-admin (= 0.31.0)
+ decidim-api (= 0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-generators (= 0.31.0)
+ decidim-verifications (= 0.31.0)
+ erb_lint (~> 0.8.0)
factory_bot_rails (~> 6.2)
faker (~> 3.2)
i18n-tasks (~> 1.0)
nokogiri (~> 1.16, >= 1.16.2)
parallel_tests (~> 4.2)
- puma (~> 6.2, >= 6.3.1)
+ puma (~> 6.5)
rails-controller-testing (~> 1.0)
rspec (~> 3.12)
rspec-cells (~> 0.3.7)
@@ -256,15 +282,16 @@ GEM
rspec-rails (~> 6.0)
rspec-retry (~> 0.6.2)
rspec_junit_formatter (~> 0.6.0)
- rubocop (~> 1.65.0)
- rubocop-capybara (~> 2.21)
- rubocop-factory_bot (~> 2.26)
- rubocop-faker (~> 1.1)
- rubocop-performance (~> 1.21)
- rubocop-rails (~> 2.25)
- rubocop-rspec (~> 3.0)
- rubocop-rspec_rails (~> 2.30)
- rubocop-rubycw (~> 0.1)
+ rubocop (~> 1.78.0)
+ rubocop-capybara (~> 2.22.0, >= 2.22.1)
+ rubocop-factory_bot (~> 2.27.0)
+ rubocop-faker (~> 1.3, >= 1.3.0)
+ rubocop-graphql (~> 1.5, >= 1.5.6)
+ rubocop-performance (~> 1.25, >= 1.25.0)
+ rubocop-rails (~> 2.32.0, >= 2.32.0)
+ rubocop-rspec (~> 3.0, >= 3.6.0)
+ rubocop-rspec_rails (~> 2.31.0)
+ rubocop-rubycw (~> 0.2.0)
selenium-webdriver (~> 4.9)
simplecov (~> 0.22.0)
simplecov-cobertura (~> 2.1.0)
@@ -273,41 +300,39 @@ GEM
w3c_rspec_validators (~> 0.3.0)
webmock (~> 3.18)
wisper-rspec (~> 1.0)
- decidim-forms (0.29.1)
- decidim-core (= 0.29.1)
- wicked_pdf (~> 2.1)
- wkhtmltopdf-binary (= 0.12.6.6)
- decidim-generators (0.29.1)
- decidim-core (= 0.29.1)
- decidim-meetings (0.29.1)
- decidim-core (= 0.29.1)
- decidim-forms (= 0.29.1)
+ decidim-forms (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-generators (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-meetings (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-forms (= 0.31.0)
icalendar (~> 2.5)
- decidim-pages (0.29.1)
- decidim-core (= 0.29.1)
- decidim-participatory_processes (0.29.1)
- decidim-core (= 0.29.1)
- decidim-proposals (0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- doc2text (~> 0.4.7)
+ decidim-pages (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-participatory_processes (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-proposals (0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ doc2text (~> 0.4.0, >= 0.4.8)
redcarpet (~> 3.5, >= 3.5.1)
- decidim-sortitions (0.29.1)
- decidim-admin (= 0.29.1)
- decidim-comments (= 0.29.1)
- decidim-core (= 0.29.1)
- decidim-proposals (= 0.29.1)
- decidim-surveys (0.29.1)
- decidim-core (= 0.29.1)
- decidim-forms (= 0.29.1)
- decidim-system (0.29.1)
+ decidim-sortitions (0.31.0)
+ decidim-admin (= 0.31.0)
+ decidim-comments (= 0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-proposals (= 0.31.0)
+ decidim-surveys (0.31.0)
+ decidim-core (= 0.31.0)
+ decidim-forms (= 0.31.0)
+ decidim-system (0.31.0)
active_link_to (~> 1.0)
- decidim-core (= 0.29.1)
+ decidim-core (= 0.31.0)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0, >= 2.0.9)
- decidim-verifications (0.29.1)
- decidim-core (= 0.29.1)
+ decidim-verifications (0.31.0)
+ decidim-core (= 0.31.0)
declarative-builder (0.2.0)
trailblazer-option (~> 0.1.0)
declarative-option (0.1.0)
@@ -317,49 +342,73 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
- devise-i18n (1.11.0)
+ devise-i18n (1.15.0)
devise (>= 4.9.0)
- devise_invitable (2.0.9)
+ rails-i18n
+ devise-jwt (0.12.1)
+ devise (~> 4.0)
+ warden-jwt_auth (~> 0.10)
+ devise_invitable (2.0.11)
actionmailer (>= 5.0)
devise (>= 4.6)
- diff-lcs (1.5.1)
- diffy (3.4.3)
- doc2text (0.4.7)
- nokogiri (>= 1.13.2, < 1.17.0)
+ diff-lcs (1.6.2)
+ diffy (3.4.4)
+ doc2text (0.4.8)
+ nokogiri (>= 1.18.2)
rubyzip (~> 2.3.0)
docile (1.4.1)
- doorkeeper (5.8.1)
+ doorkeeper (5.8.2)
railties (>= 5)
doorkeeper-i18n (4.0.1)
- erb_lint (0.4.0)
+ drb (2.2.3)
+ dry-auto_inject (1.1.0)
+ dry-core (~> 1.1)
+ zeitwerk (~> 2.6)
+ dry-configurable (1.3.0)
+ dry-core (~> 1.1)
+ zeitwerk (~> 2.6)
+ dry-core (1.2.0)
+ concurrent-ruby (~> 1.0)
+ logger
+ zeitwerk (~> 2.6)
+ erb (6.0.1)
+ erb_lint (0.8.0)
activesupport
better_html (>= 2.0.1)
parser (>= 2.7.1.4)
rainbow
- rubocop
+ rubocop (>= 1)
smart_properties
erbse (0.1.4)
temple
erubi (1.13.1)
escape_utils (1.3.0)
- excon (1.2.2)
+ excon (1.3.2)
+ logger
extended-markdown-filter (0.7.0)
html-pipeline (~> 2.9)
- factory_bot (6.5.0)
- activesupport (>= 5.0.0)
- factory_bot_rails (6.4.4)
+ factory_bot (6.5.6)
+ activesupport (>= 6.1.0)
+ factory_bot_rails (6.5.1)
factory_bot (~> 6.5)
- railties (>= 5.0.0)
- faker (3.5.1)
+ railties (>= 6.1.0)
+ faker (3.5.3)
i18n (>= 1.8.11, < 2)
- faraday (2.12.2)
+ faraday (2.14.0)
faraday-net_http (>= 2.0, < 3.5)
json
logger
- faraday-net_http (3.4.0)
- net-http (>= 0.5.0)
- ffi (1.17.0-x86_64-darwin)
- ffi (1.17.0-x86_64-linux-gnu)
+ faraday-net_http (3.4.2)
+ net-http (~> 0.5)
+ ffi (1.17.3-aarch64-linux-gnu)
+ ffi (1.17.3-aarch64-linux-musl)
+ ffi (1.17.3-arm-linux-gnu)
+ ffi (1.17.3-arm-linux-musl)
+ ffi (1.17.3-arm64-darwin)
+ ffi (1.17.3-x86_64-darwin)
+ ffi (1.17.3-x86_64-linux-gnu)
+ ffi (1.17.3-x86_64-linux-musl)
+ fiber-storage (1.0.1)
file_validators (3.0.0)
activemodel (>= 3.2)
mime-types (>= 1.0)
@@ -368,62 +417,98 @@ GEM
excon (~> 1.0)
formatador (>= 0.2, < 2.0)
mime-types
- fog-local (0.8.0)
+ fog-local (0.9.0)
fog-core (>= 1.27, < 3.0)
- formatador (1.1.0)
- foundation_rails_helper (4.0.1)
- actionpack (>= 4.1, < 7.1)
- activemodel (>= 4.1, < 7.1)
- activesupport (>= 4.1, < 7.1)
- railties (>= 4.1, < 7.1)
+ formatador (1.2.3)
+ reline
gemoji (3.0.1)
- geocoder (1.8.5)
+ geocoder (1.8.6)
base64 (>= 0.1.0)
csv (>= 3.0.0)
- globalid (1.2.1)
+ geom2d (0.4.1)
+ globalid (1.3.0)
activesupport (>= 6.1)
- graphql (2.2.16)
+ google-protobuf (4.33.2)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.33.2-aarch64-linux-gnu)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.33.2-aarch64-linux-musl)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.33.2-arm64-darwin)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.33.2-x86_64-darwin)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.33.2-x86_64-linux-gnu)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.33.2-x86_64-linux-musl)
+ bigdecimal
+ rake (>= 13)
+ graphql (2.4.17)
base64
- graphql-docs (4.0.0)
+ fiber-storage
+ logger
+ graphql-docs (5.2.0)
commonmarker (~> 0.23, >= 0.23.6)
- dartsass (~> 1.49)
escape_utils (~> 1.2)
extended-markdown-filter (~> 0.4)
gemoji (~> 3.0)
graphql (~> 2.0)
html-pipeline (~> 2.14, >= 2.14.3)
- hashdiff (1.1.2)
- hashie (5.0.0)
- highline (3.1.1)
+ logger (~> 1.6)
+ ostruct (~> 0.6)
+ sass-embedded (~> 1.58)
+ hashdiff (1.2.1)
+ hashie (5.1.0)
+ logger
+ hexapdf (1.1.1)
+ cmdparse (~> 3.0, >= 3.0.3)
+ geom2d (~> 0.4, >= 0.4.1)
+ openssl (>= 2.2.1)
+ strscan (>= 3.1.2)
+ highline (3.1.2)
reline
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
- htmlentities (4.3.4)
- i18n (1.14.6)
+ htmlentities (4.4.2)
+ i18n (1.14.8)
concurrent-ruby (~> 1.0)
- i18n-tasks (1.0.14)
+ i18n-tasks (1.1.2)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
erubi
- highline (>= 2.0.0)
+ highline (>= 3.0.0)
i18n
parser (>= 3.2.2.1)
+ prism
rails-i18n
rainbow (>= 2.2.2, < 4.0)
+ ruby-progressbar (~> 1.8, >= 1.8.1)
terminal-table (>= 1.5.1)
- icalendar (2.10.3)
+ icalendar (2.12.1)
+ base64
ice_cube (~> 0.16)
+ logger
ostruct
ice_cube (0.17.0)
- image_processing (1.13.0)
- mini_magick (>= 4.9.5, < 5)
+ image_processing (1.14.0)
+ mini_magick (>= 4.9.5, < 6)
ruby-vips (>= 2.0.17, < 3)
invisible_captcha (0.13.0)
rails (>= 3.2.0)
- io-console (0.8.0)
- json (2.9.1)
- jwt (2.10.1)
+ io-console (0.8.2)
+ irb (1.16.0)
+ pp (>= 0.6.0)
+ rdoc (>= 4.0.0)
+ reline (>= 0.4.2)
+ json (2.18.0)
+ jwt (3.1.2)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
@@ -437,10 +522,11 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
- language_server-protocol (3.17.0.3)
- launchy (3.0.1)
+ language_server-protocol (3.17.0.5)
+ launchy (3.1.1)
addressable (~> 2.8)
childprocess (~> 5.0)
+ logger (~> 1.6)
letter_opener (1.10.0)
launchy (>= 2.2, < 4)
letter_opener_web (2.0.0)
@@ -448,68 +534,85 @@ GEM
letter_opener (~> 1.7)
railties (>= 5.2)
rexml
+ lint_roller (1.1.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
- logger (1.6.4)
- loofah (2.23.1)
+ logger (1.7.0)
+ loofah (2.25.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
- mail (2.8.1)
+ mail (2.9.0)
+ logger
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
- marcel (1.0.4)
- matrix (0.4.2)
- method_source (1.1.0)
- mime-types (3.6.0)
+ marcel (1.1.0)
+ matrix (0.4.3)
+ mime-types (3.7.0)
logger
- mime-types-data (~> 3.2015)
- mime-types-data (3.2024.1203)
+ mime-types-data (~> 3.2025, >= 3.2025.0507)
+ mime-types-data (3.2025.0924)
mini_magick (4.13.2)
mini_mime (1.1.5)
- minitest (5.25.4)
- msgpack (1.7.5)
- multi_xml (0.7.1)
- bigdecimal (~> 3.1)
- net-http (0.6.0)
- uri
- net-imap (0.5.4)
+ minitest (6.0.1)
+ prism (~> 1.5)
+ msgpack (1.8.0)
+ multi_xml (0.8.1)
+ bigdecimal (>= 3.1, < 5)
+ net-http (0.9.1)
+ uri (>= 0.11.1)
+ net-imap (0.6.2)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
- net-smtp (0.3.4)
+ net-smtp (0.5.1)
net-protocol
- nio4r (2.7.4)
- nokogiri (1.16.8-x86_64-darwin)
+ nio4r (2.7.5)
+ nokogiri (1.19.0-aarch64-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.19.0-aarch64-linux-musl)
+ racc (~> 1.4)
+ nokogiri (1.19.0-arm-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.19.0-arm-linux-musl)
+ racc (~> 1.4)
+ nokogiri (1.19.0-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.16.8-x86_64-linux)
+ nokogiri (1.19.0-x86_64-darwin)
racc (~> 1.4)
- oauth (1.1.0)
- oauth-tty (~> 1.0, >= 1.0.1)
+ nokogiri (1.19.0-x86_64-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.19.0-x86_64-linux-musl)
+ racc (~> 1.4)
+ oauth (1.1.3)
+ base64 (~> 0.1)
+ oauth-tty (~> 1.0, >= 1.0.6)
snaky_hash (~> 2.0)
- version_gem (~> 1.1)
- oauth-tty (1.0.5)
- version_gem (~> 1.1, >= 1.1.1)
- oauth2 (2.0.9)
- faraday (>= 0.17.3, < 3.0)
- jwt (>= 1.0, < 3.0)
+ version_gem (~> 1.1, >= 1.1.9)
+ oauth-tty (1.0.6)
+ version_gem (~> 1.1, >= 1.1.9)
+ oauth2 (2.0.18)
+ faraday (>= 0.17.3, < 4.0)
+ jwt (>= 1.0, < 4.0)
+ logger (~> 1.2)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
- snaky_hash (~> 2.0)
- version_gem (~> 1.1)
- omniauth (2.1.2)
+ snaky_hash (~> 2.0, >= 2.0.3)
+ version_gem (~> 1.1, >= 1.1.9)
+ omniauth (2.1.4)
hashie (>= 3.4.6)
+ logger
rack (>= 2.2.3)
rack-protection
omniauth-facebook (5.0.0)
omniauth-oauth2 (~> 1.2)
- omniauth-google-oauth2 (1.2.0)
- jwt (>= 2.9)
+ omniauth-google-oauth2 (1.2.1)
+ jwt (>= 2.9.2)
oauth2 (~> 2.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.8)
@@ -517,8 +620,8 @@ GEM
oauth
omniauth (>= 1.0, < 3)
rack (>= 1.6.2, < 4)
- omniauth-oauth2 (1.8.0)
- oauth2 (>= 1.4, < 3)
+ omniauth-oauth2 (1.9.0)
+ oauth2 (>= 2.0.2, < 3)
omniauth (~> 2.0)
omniauth-rails_csrf_protection (1.0.2)
actionpack (>= 4.2)
@@ -526,22 +629,27 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
- openssl (3.2.0)
+ openssl (4.0.0)
orm_adapter (0.5.0)
- ostruct (0.6.1)
- paper_trail (12.3.0)
- activerecord (>= 5.2)
- request_store (~> 1.1)
- parallel (1.26.3)
- parallel_tests (4.7.2)
+ ostruct (0.6.3)
+ package_json (0.2.0)
+ paper_trail (16.0.0)
+ activerecord (>= 6.1)
+ request_store (~> 1.4)
+ parallel (1.27.0)
+ parallel_tests (4.10.1)
parallel
- parser (3.3.6.0)
+ paranoia (3.0.1)
+ activerecord (>= 6, < 8.1)
+ parser (3.3.10.0)
ast (~> 2.4.1)
racc
- pg (1.4.6)
+ pg (1.5.9)
pg_search (2.3.7)
activerecord (>= 6.1)
activesupport (>= 6.1)
+ pp (0.6.3)
+ prettyprint
premailer (1.27.0)
addressable
css_parser (>= 1.19.0)
@@ -550,14 +658,17 @@ GEM
actionmailer (>= 3)
net-smtp
premailer (~> 1.7, >= 1.7.9)
- psych (4.0.6)
+ prettyprint (0.2.0)
+ prism (1.7.0)
+ psych (5.3.1)
+ date
stringio
- public_suffix (6.0.1)
- puma (6.5.0)
+ public_suffix (7.0.2)
+ puma (6.6.1)
nio4r (~> 2.0)
racc (1.8.1)
- rack (2.2.10)
- rack-attack (6.7.0)
+ rack (2.2.21)
+ rack-attack (6.8.0)
rack (>= 1.0, < 4)
rack-cors (1.1.1)
rack (>= 2.0.0)
@@ -566,27 +677,32 @@ GEM
rack (~> 2.2, >= 2.2.4)
rack-proxy (0.7.7)
rack
+ rack-session (1.0.2)
+ rack (< 3)
rack-test (2.2.0)
rack (>= 1.3)
- rails (7.0.8.7)
- actioncable (= 7.0.8.7)
- actionmailbox (= 7.0.8.7)
- actionmailer (= 7.0.8.7)
- actionpack (= 7.0.8.7)
- actiontext (= 7.0.8.7)
- actionview (= 7.0.8.7)
- activejob (= 7.0.8.7)
- activemodel (= 7.0.8.7)
- activerecord (= 7.0.8.7)
- activestorage (= 7.0.8.7)
- activesupport (= 7.0.8.7)
+ rackup (1.0.1)
+ rack (< 3)
+ webrick
+ rails (7.2.3)
+ actioncable (= 7.2.3)
+ actionmailbox (= 7.2.3)
+ actionmailer (= 7.2.3)
+ actionpack (= 7.2.3)
+ actiontext (= 7.2.3)
+ actionview (= 7.2.3)
+ activejob (= 7.2.3)
+ activemodel (= 7.2.3)
+ activerecord (= 7.2.3)
+ activestorage (= 7.2.3)
+ activesupport (= 7.2.3)
bundler (>= 1.15.0)
- railties (= 7.0.8.7)
+ railties (= 7.2.3)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
- rails-dom-testing (2.2.0)
+ rails-dom-testing (2.3.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
@@ -596,49 +712,60 @@ GEM
rails-i18n (7.0.10)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
- railties (7.0.8.7)
- actionpack (= 7.0.8.7)
- activesupport (= 7.0.8.7)
- method_source
+ railties (7.2.3)
+ actionpack (= 7.2.3)
+ activesupport (= 7.2.3)
+ cgi
+ irb (~> 1.13)
+ rackup (>= 1.0.0)
rake (>= 12.2)
- thor (~> 1.0)
- zeitwerk (~> 2.5)
+ thor (~> 1.0, >= 1.2.2)
+ tsort (>= 0.2)
+ zeitwerk (~> 2.6)
rainbow (3.1.1)
- rake (13.2.1)
- ransack (3.2.1)
+ rake (13.3.1)
+ ransack (4.2.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
- redcarpet (3.6.0)
+ rdoc (7.0.3)
+ erb
+ psych (>= 4.0.0)
+ tsort
+ redcarpet (3.6.1)
redis (4.8.1)
- regexp_parser (2.10.0)
- reline (0.6.0)
+ regexp_parser (2.11.3)
+ reline (0.6.3)
io-console (~> 0.5)
- request_store (1.5.1)
+ request_store (1.7.0)
rack (>= 1.4)
- responders (3.1.1)
- actionpack (>= 5.2)
- railties (>= 5.2)
- rexml (3.4.0)
- rspec (3.13.0)
+ responders (3.2.0)
+ actionpack (>= 7.0)
+ railties (>= 7.0)
+ rexml (3.4.1)
+ rqrcode (2.2.0)
+ chunky_png (~> 1.0)
+ rqrcode_core (~> 1.0)
+ rqrcode_core (1.2.0)
+ rspec (3.13.2)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-cells (0.3.10)
cells (>= 4.0.0, < 6.0.0)
rspec-rails (>= 3.0.0)
- rspec-core (3.13.2)
+ rspec-core (3.13.6)
rspec-support (~> 3.13.0)
- rspec-expectations (3.13.3)
+ rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-html-matchers (0.10.0)
nokogiri (~> 1)
rspec (>= 3.0.0.a)
- rspec-mocks (3.13.2)
+ rspec-mocks (3.13.7)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.5)
@@ -651,61 +778,91 @@ GEM
rspec-support (~> 3.13)
rspec-retry (0.6.2)
rspec-core (> 3.3)
- rspec-support (3.13.2)
+ rspec-support (3.13.6)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (1.65.1)
+ rubocop (1.78.0)
json (~> 2.3)
- language_server-protocol (>= 3.17.0)
+ language_server-protocol (~> 3.17.0.2)
+ lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 2.4, < 3.0)
- rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.31.1, < 2.0)
+ regexp_parser (>= 2.9.3, < 3.0)
+ rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.37.0)
- parser (>= 3.3.1.0)
- rubocop-capybara (2.21.0)
- rubocop (~> 1.41)
- rubocop-factory_bot (2.26.1)
- rubocop (~> 1.61)
- rubocop-faker (1.2.0)
+ unicode-display_width (>= 2.4.0, < 4.0)
+ rubocop-ast (1.49.0)
+ parser (>= 3.3.7.2)
+ prism (~> 1.7)
+ rubocop-capybara (2.22.1)
+ lint_roller (~> 1.1)
+ rubocop (~> 1.72, >= 1.72.1)
+ rubocop-factory_bot (2.27.1)
+ lint_roller (~> 1.1)
+ rubocop (~> 1.72, >= 1.72.1)
+ rubocop-faker (1.3.0)
faker (>= 2.12.0)
- rubocop (>= 1.13.0)
- rubocop-performance (1.23.0)
- rubocop (>= 1.48.1, < 2.0)
- rubocop-ast (>= 1.31.1, < 2.0)
- rubocop-rails (2.28.0)
+ lint_roller (~> 1.1)
+ rubocop (>= 1.72.1)
+ rubocop-graphql (1.5.6)
+ lint_roller (~> 1.1)
+ rubocop (>= 1.72.1, < 2)
+ rubocop-performance (1.26.1)
+ lint_roller (~> 1.1)
+ rubocop (>= 1.75.0, < 2.0)
+ rubocop-ast (>= 1.47.1, < 2.0)
+ rubocop-rails (2.32.0)
activesupport (>= 4.2.0)
+ lint_roller (~> 1.1)
rack (>= 1.1)
- rubocop (>= 1.52.0, < 2.0)
- rubocop-ast (>= 1.31.1, < 2.0)
- rubocop-rspec (3.3.0)
- rubocop (~> 1.61)
- rubocop-rspec_rails (2.30.0)
- rubocop (~> 1.61)
- rubocop-rspec (~> 3, >= 3.0.1)
- rubocop-rubycw (0.1.6)
- rubocop (~> 1.0)
+ rubocop (>= 1.75.0, < 2.0)
+ rubocop-ast (>= 1.44.0, < 2.0)
+ rubocop-rspec (3.7.0)
+ lint_roller (~> 1.1)
+ rubocop (~> 1.72, >= 1.72.1)
+ rubocop-rspec_rails (2.31.0)
+ lint_roller (~> 1.1)
+ rubocop (~> 1.72, >= 1.72.1)
+ rubocop-rspec (~> 3.5)
+ rubocop-rubycw (0.2.2)
+ lint_roller (~> 1.1)
+ rubocop (~> 1.72, >= 1.72.1)
ruby-progressbar (1.13.0)
- ruby-vips (2.2.2)
+ ruby-vips (2.3.0)
ffi (~> 1.12)
logger
rubyXL (3.4.33)
nokogiri (>= 1.10.8)
rubyzip (>= 1.3.0)
rubyzip (2.3.2)
- selenium-webdriver (4.27.0)
+ sass-embedded (1.97.2-aarch64-linux-gnu)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-aarch64-linux-musl)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-arm-linux-gnueabihf)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-arm-linux-musleabihf)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-arm64-darwin)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-x86_64-darwin)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-x86_64-linux-gnu)
+ google-protobuf (~> 4.31)
+ sass-embedded (1.97.2-x86_64-linux-musl)
+ google-protobuf (~> 4.31)
+ securerandom (0.4.1)
+ selenium-webdriver (4.39.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
- rubyzip (>= 1.2.2, < 3.0)
+ rubyzip (>= 1.2.2, < 4.0)
websocket (~> 1.0)
semantic_range (3.1.0)
- shakapacker (7.1.0)
+ shakapacker (8.3.0)
activesupport (>= 5.2)
+ package_json
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
@@ -716,34 +873,39 @@ GEM
simplecov-cobertura (2.1.0)
rexml
simplecov (~> 0.19)
- simplecov-html (0.13.1)
+ simplecov-html (0.13.2)
simplecov_json_formatter (0.1.4)
smart_properties (1.17.0)
- snaky_hash (2.0.1)
- hashie
- version_gem (~> 1.1, >= 1.1.1)
- spring (4.2.1)
+ snaky_hash (2.0.3)
+ hashie (>= 0.1.0, < 6)
+ version_gem (>= 1.1.8, < 3)
+ spring (4.4.0)
spring-watcher-listen (2.1.0)
listen (>= 2.7, < 4.0)
spring (>= 4)
- stringio (3.1.2)
- temple (0.10.3)
- terminal-table (3.0.2)
- unicode-display_width (>= 1.1.1, < 3)
- thor (1.3.2)
- tilt (2.5.0)
- timeout (0.4.3)
+ stringio (3.2.0)
+ strscan (3.1.7)
+ temple (0.10.4)
+ terminal-table (4.0.0)
+ unicode-display_width (>= 1.1.1, < 4)
+ thor (1.5.0)
+ tilt (2.6.1)
+ timeout (0.6.0)
trailblazer-option (0.1.2)
+ tsort (0.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
- unicode-display_width (2.6.0)
- uniform_notifier (1.16.0)
- uri (1.0.2)
- valid_email2 (4.0.6)
- activemodel (>= 3.2)
+ unicode-display_width (3.2.0)
+ unicode-emoji (~> 4.1)
+ unicode-emoji (4.2.0)
+ uniform_notifier (1.18.0)
+ uri (1.1.1)
+ useragent (0.16.11)
+ valid_email2 (7.0.13)
+ activemodel (>= 6.0)
mail (~> 2.5)
- version_gem (1.1.4)
+ version_gem (1.1.9)
w3c_rspec_validators (0.3.0)
rails
rspec
@@ -754,42 +916,53 @@ GEM
rexml (~> 3.2)
warden (1.2.9)
rack (>= 2.0.9)
+ warden-jwt_auth (0.12.0)
+ dry-auto_inject (>= 0.8, < 2)
+ dry-configurable (>= 0.13, < 2)
+ jwt (>= 2.1, < 4)
+ warden (~> 1.2)
web-console (4.2.1)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- web-push (3.0.1)
- jwt (~> 2.0)
- openssl (~> 3.0)
- webmock (3.24.0)
+ web-push (3.1.0)
+ jwt (~> 3.0)
+ openssl (>= 3.0)
+ webmock (3.26.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
+ webrick (1.9.2)
websocket (1.2.11)
- websocket-driver (0.7.6)
+ websocket-driver (0.8.0)
+ base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
- wicked_pdf (2.8.2)
- activesupport
- ostruct
- wisper (2.0.1)
+ wisper (3.0.0)
wisper-rspec (1.1.0)
- wkhtmltopdf-binary (0.12.6.6)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.7.1)
+ zeitwerk (2.7.4)
PLATFORMS
+ aarch64-linux-gnu
+ aarch64-linux-musl
+ arm-linux-gnu
+ arm-linux-gnueabihf
+ arm-linux-musl
+ arm-linux-musleabihf
+ arm64-darwin
x86_64-darwin
- x86_64-linux
+ x86_64-linux-gnu
+ x86_64-linux-musl
DEPENDENCIES
bootsnap (~> 1.4)
byebug (~> 11.0)
- decidim (~> 0.29.1)
+ decidim (~> 0.31.0)
decidim-cleaner!
- decidim-dev (~> 0.29.1)
+ decidim-dev (~> 0.31.0)
faker (~> 3.2)
letter_opener_web (~> 2.0)
listen (~> 3.1)
@@ -800,7 +973,7 @@ DEPENDENCIES
web-console (~> 4.2)
RUBY VERSION
- ruby 3.2.2p53
+ ruby 3.3.4p94
BUNDLED WITH
- 2.5.22
+ 2.5.11
diff --git a/app/commands/decidim/cleaner/custom_destroy_account.rb b/app/commands/decidim/cleaner/custom_destroy_account.rb
index 373dae4..56d4c0f 100644
--- a/app/commands/decidim/cleaner/custom_destroy_account.rb
+++ b/app/commands/decidim/cleaner/custom_destroy_account.rb
@@ -21,6 +21,7 @@ def destroy_user_account!
@user.email = ""
@user.personal_url = ""
@user.about = ""
+ @user.notifications_sending_frequency = "none"
@user.delete_reason = @form.delete_reason
@user.admin = false if @user.admin?
@user.deleted_at = Time.current
diff --git a/app/controllers/decidim/cleaner/admin/organization_cleaner_controller.rb b/app/controllers/decidim/cleaner/admin/organization_cleaner_controller.rb
index 9204748..941527e 100644
--- a/app/controllers/decidim/cleaner/admin/organization_cleaner_controller.rb
+++ b/app/controllers/decidim/cleaner/admin/organization_cleaner_controller.rb
@@ -6,6 +6,7 @@ module Admin
# Controller that allows managing the appearance of the organization.
class OrganizationCleanerController < Decidim::Admin::ApplicationController
include Decidim::Admin::Engine.routes.url_helpers
+
layout "decidim/admin/settings"
def edit
diff --git a/app/views/decidim/cleaner/inactive_users_mailer/warning_deletion.html.erb b/app/views/decidim/cleaner/inactive_users_mailer/warning_deletion.html.erb
index 02ebead..6411aa6 100644
--- a/app/views/decidim/cleaner/inactive_users_mailer/warning_deletion.html.erb
+++ b/app/views/decidim/cleaner/inactive_users_mailer/warning_deletion.html.erb
@@ -1,7 +1,7 @@
<%= t ".hello" %>
-<%= t(".body_1", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host), days: email_inactive_after(@organization) + delete_inactive_after(@organization)).html_safe %>
+<%= t(".body_1", organization_name: h(translated_attribute(@organization.name)), organization_url: decidim.root_url(host: @organization.host), days: email_inactive_after(@organization) + delete_inactive_after(@organization)).html_safe %>
<%= t ".body_2" %>
-<%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %>
+<%= t(".greetings", organization_name: h(translated_attribute(@organization.name)), organization_url: decidim.root_url(host: @organization.host)).html_safe %>
diff --git a/app/views/decidim/cleaner/inactive_users_mailer/warning_inactive.html.erb b/app/views/decidim/cleaner/inactive_users_mailer/warning_inactive.html.erb
index 41674f7..58b7ba9 100644
--- a/app/views/decidim/cleaner/inactive_users_mailer/warning_inactive.html.erb
+++ b/app/views/decidim/cleaner/inactive_users_mailer/warning_inactive.html.erb
@@ -1,7 +1,7 @@
<%= t ".hello" %>
-<%= t ".body_1", organization_name: h(@organization.name), days: email_inactive_after(@organization) %>
+<%= t ".body_1", organization_name: h(translated_attribute(@organization.name)), days: email_inactive_after(@organization) %>
<%= t(".body_2", remaining_days: delete_inactive_after(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %>
-<%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %>
+<%= t(".greetings", organization_name: h(translated_attribute(@organization.name)), organization_url: decidim.root_url(host: @organization.host)).html_safe %>
diff --git a/decidim-cleaner.gemspec b/decidim-cleaner.gemspec
index af44704..0e18046 100644
--- a/decidim-cleaner.gemspec
+++ b/decidim-cleaner.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = "~> 3.2"
+ s.required_ruby_version = "~> 3.3"
s.name = "decidim-cleaner"
s.summary = "A decidim cleaner module"
diff --git a/lib/decidim/cleaner/version.rb b/lib/decidim/cleaner/version.rb
index 67062ce..5303788 100644
--- a/lib/decidim/cleaner/version.rb
+++ b/lib/decidim/cleaner/version.rb
@@ -5,11 +5,11 @@ module Decidim
# This holds the decidim-meetings version.
module Cleaner
def self.version
- "5.0.0"
+ "5.1.0"
end
def self.compatible_decidim_version
- "~> 0.29.0"
+ "~> 0.31.0"
end
end
end
diff --git a/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb b/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb
index 1b402bf..08ba6dd 100644
--- a/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb
+++ b/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb
@@ -61,6 +61,12 @@ module Cleaner
expect(user.about).to eq("")
end
+ it "sets notifications_sending_frequency to none" do
+ command.call
+ user.reload
+ expect(user.notifications_sending_frequency).to eq("none")
+ end
+
it "destroys the current user avatar" do
command.call
expect(user.reload.avatar).not_to be_present
@@ -72,15 +78,6 @@ module Cleaner
end.to change(Identity, :count).by(-1)
end
- it "deletes user group memberships" do
- user_group = create(:user_group)
- create(:user_group_membership, user_group:, user:)
-
- expect do
- command.call
- end.to change(UserGroupMembership, :count).by(-1)
- end
-
it "deletes the follows" do
other_user = create(:user)
create(:follow, followable: user, user: other_user)
diff --git a/spec/factories.rb b/spec/factories.rb
index 9924ee8..5e02f72 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -29,10 +29,8 @@
users_registration_mode { :enabled }
official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
official_url { Faker::Internet.url }
- highlighted_content_banner_enabled { false }
enable_omnipresent_banner { false }
badges_enabled { true }
- user_groups_enabled { true }
send_welcome_notification { true }
comments_max_length { 1000 }
admin_terms_of_service_body { generate_localized_description(:admin_terms_of_service_body, skip_injection:) }
diff --git a/spec/lib/decidim/cleaner/version_spec.rb b/spec/lib/decidim/cleaner/version_spec.rb
index 7aaa0b0..003e236 100644
--- a/spec/lib/decidim/cleaner/version_spec.rb
+++ b/spec/lib/decidim/cleaner/version_spec.rb
@@ -7,11 +7,11 @@ module Decidim
subject { described_class }
it "has version" do
- expect(subject.version).to eq("5.0.0")
+ expect(subject.version).to eq("5.1.0")
end
it "has decidim version compatibility" do
- expect(subject.compatible_decidim_version).to eq("~> 0.29.0")
+ expect(subject.compatible_decidim_version).to eq("~> 0.31.0")
end
end
end