Merge branch 'master' into dependabot/bundler/decidim-regulations/act…

…ionpack-6.1.7.9

.github/workflows/linters.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.7
+  RUBY_VERSION: 3.1.1
 
 jobs:
   test-report:

.github/workflows/test-process_extended.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.7
+  RUBY_VERSION: 3.1.1
 
 jobs:
   test-report:
@@ -69,6 +69,9 @@ jobs:
         with:
           chrome-version: 119.0.6045.105
 
+      - name: Install ImageMagick
+        run: sudo apt install imagemagick
+
       - name: Install Ruby deps
         uses: nick-invision/retry@v2
         with:

.github/workflows/test-recaptcha.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.7
+  RUBY_VERSION: 3.1.1
 
 jobs:
   test-report:
@@ -69,6 +69,9 @@ jobs:
         with:
           chrome-version: 119.0.6045.105
 
+      - name: Install ImageMagick
+        run: sudo apt install imagemagick
+
       - name: Install Ruby deps
         uses: nick-invision/retry@v2
         with:

.github/workflows/test-top_comments.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.7
+  RUBY_VERSION: 3.1.1
 
 jobs:
   test-report:
@@ -69,6 +69,9 @@ jobs:
         with:
           chrome-version: 119.0.6045.105
 
+      - name: Install ImageMagick
+        run: sudo apt install imagemagick
+
       - name: Install Ruby deps
         uses: nick-invision/retry@v2
         with:

.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.7
+  RUBY_VERSION: 3.1.1
   NODE_VERSION: 16.9.1
 
 jobs:
@@ -79,6 +79,9 @@ jobs:
         with:
           chrome-version: 119.0.6045.105
 
+      - name: Install ImageMagick
+        run: sudo apt install imagemagick
+
       - name: Install Ruby deps
         uses: nick-invision/retry@v2
         with:

.github/workflows/validate_migrations.yml

@@ -12,7 +12,7 @@ env:
   DB_DATABASE: app
   DB_USERNAME: postgres
   DB_PASSWORD: postgres
-  RUBY_VERSION: 3.0.7
+  RUBY_VERSION: 3.1.1
 
 jobs:
   test:

.gitignore

@@ -47,3 +47,5 @@ spec/decidim_dummy_app/
 
 coverage/
 storage/
+
+tailwind.config.js

.node-version

@@ -1 +1 @@
-16.9.1
+18.17.1

.ruby-version

@@ -1 +1 @@
-3.0.7
+3.1.1

Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 ruby RUBY_VERSION
-DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", branch: "release/0.27-stable" }.freeze
+DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", branch: "release/0.28-stable_decidim_templates" }.freeze
 
 gem "decidim", DECIDIM_VERSION
 gem "decidim-templates", DECIDIM_VERSION
@@ -15,20 +15,24 @@ gem "decidim-recaptcha", path: "decidim-recaptcha"
 gem "decidim-regulations", path: "decidim-regulations"
 gem "decidim-top_comments", path: "decidim-top_comments"
 
-gem "decidim-cdtb"
-gem "decidim-challenges", git: "https://github.com/gencat/decidim-module-challenges.git", tag: "v0.3.3"
-gem "decidim-department_admin", "~> 0.7.2"
-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", "~> 0.0.6.1"
+gem "decidim-cdtb", git: "https://github.com/CodiTramuntana/decidim-module-cdtb.git", tag: "v0.3.0"
+gem "decidim-challenges", git: "https://github.com/gencat/decidim-module-challenges.git", tag: "v0.5.0"
+gem "decidim-department_admin", "~> 0.8.0"
+gem "decidim-idcat_mobil", git: "https://github.com/gencat/decidim-module-idcat_mobil.git", tag: "v0.5.0"
+gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git"
+gem "decidim-verifications-members_picker", "~> 0.0.7"
 #### Custom gems and modifications block end ####
 
 gem "soda-ruby", require: false
 
 gem "puma"
 
-gem "figaro", ">= 1.1.1"
+# TODO: Psych problem: https://github.com/laserlemon/figaro/issues/289
+# gem "figaro"
+# This gem is an alternative to Figaro meanwhile fix that problem in Figaro.
+# https://github.com/hlascelles/figjam
+gem "figjam"
+gem "wkhtmltopdf-binary"
 
 gem "daemons"
 gem "deface"
@@ -49,15 +53,16 @@ group :development, :test do
   gem "byebug", platform: :mri
   gem "decidim-dev", DECIDIM_VERSION
   gem "faker"
-  gem "rspec-rails"
   gem "rubocop-faker"
+  # Set versions because Property AutoCorrect errors.
+  gem "rspec-rails", "~> 6.0.4"
+  gem "rubocop-factory_bot", "2.25.1"
+  gem "rubocop-rspec", "2.26.1"
 end
 
 group :development do
   gem "letter_opener_web"
   gem "listen"
-  gem "spring"
-  gem "spring-watcher-listen", "~> 2.0.0"
   gem "web-console"
 end