Merge remote-tracking branch 'decidim-app/develop' into develop

.env-example

@@ -81,3 +81,21 @@ DECIDIM_ADMIN_PASSWORD_STRONG="false"
 # VAPID_PUBLIC_KEY
 # VAPID_PRIVATE_KEY
 RAILS_LOG_LEVEL=warn
+
+# Default notifications sending frequency : (daily, weekly, none, real_time)
+# NOTIFICATIONS_SENDING_FREQUENCY=daily
+
+## SMS Gateway Service (eg: decidim-half_signup)
+# SMS_GATEWAY_SERVICE="Decidim::SmsGatewayService"
+# SMS_GATEWAY_URL="https://sms.gateway.service/api"
+# SMS_GATEWAY_BULK_URL="https://sms.gateway.service/api/bulk"
+# SMS_GATEWAY_USERNAME=
+# SMS_GATEWAY_PASSWORD=
+## Set to replace the organization name
+# SMS_GATEWAY_PLATFORM="hashimoto.local"
+
+#Timeout for the unsubscribe link of the newsletter
+#NEWSLETTERS_UNSUBSCRIBE_TIMEOUT=
+
+# Redirect to the TOS page after signup (default: true)
+# DECIDIM_HALF_SIGNUP_SHOW_TOS_PAGE_AFTER_SIGNUP=true

.github/workflows/ci_cd.yml

@@ -10,8 +10,8 @@ env:
   NODE_VERSION: 16.9.1
   RUBYOPT: '-W:no-deprecated'
   # Set locales available for i18n tasks
-  ENFORCED_LOCALES: "en,fr"
-  AVAILABLE_LOCALES: "en,fr"
+  ENFORCED_LOCALES: "en,fr,ca,es"
+  AVAILABLE_LOCALES: "en,fr,ca,es"
 
 jobs:
   todo:
@@ -107,8 +107,8 @@ jobs:
       - uses: nanasess/setup-chromedriver@v2
       - run:  bundle exec rake "test:run[exclude, spec/system/**/*_spec.rb, ${{ matrix.slice }}]"
         name: RSpec
-      - run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
-        name: Upload coverage
+      #- run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
+      #  name: Upload coverage
       - uses: actions/upload-artifact@v3
         if: always()
         with:
@@ -173,8 +173,8 @@ jobs:
       - uses: nanasess/setup-chromedriver@v2
       - run:  bundle exec rake "test:run[include, spec/system/**/*_spec.rb, ${{ matrix.slice }}]"
         name: RSpec
-      - run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
-        name: Upload coverage
+      #- run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
+      #  name: Upload coverage
       - uses: actions/upload-artifact@v3
         if: always()
         with:

.rubocop_rails.yml

@@ -104,3 +104,6 @@ Rails/BulkChangeTable:
 RSpec/MultipleMemoizedHelpers:
   Exclude:
     - spec/**/**
+
+RSpec/AnyInstance:
+  Enabled: false

Gemfile

@@ -13,17 +13,23 @@ gem "decidim-conferences", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-initiatives", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-templates", "~> #{DECIDIM_VERSION}.0"
 
+# Load Budgets Booth to avoid errors
+gem "decidim-budgets_booth", github: "OpenSourcePolitics/decidim-module-ptp"
+
 # External Decidim gems
+gem "decidim-budget_category_voting", git: "https://github.com/alecslupu-pfa/decidim-budget_category_voting.git", branch: DECIDIM_BRANCH
 gem "decidim-cache_cleaner"
-gem "decidim-decidim_awesome"
+gem "decidim-category_enhanced", "~> 0.0.1"
+gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "main"
 gem "decidim-extended_socio_demographic_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module-extended_socio_demographic_authorization_handler.git",
                                                                 branch: DECIDIM_BRANCH
-gem "decidim-extra_user_fields", git: "https://github.com/PopulateTools/decidim-module-extra_user_fields.git", branch: "release/0.27-stable"
+gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: "temp/twilio-compatibility-0.27"
 gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
 gem "decidim-gallery", git: "https://github.com/OpenSourcePolitics/decidim-module-gallery.git", branch: "fix/nokogiri_deps"
+gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "feature/half_signup_and_budgets_booth"
 gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
 gem "decidim-ludens", git: "https://github.com/OpenSourcePolitics/decidim-ludens.git", branch: DECIDIM_BRANCH
-gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH
+gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "release/0.27-stable"
 gem "decidim-spam_detection"
 gem "decidim-survey_multiple_answers", git: "https://github.com/OpenSourcePolitics/decidim-module-survey_multiple_answers"
 gem "decidim-term_customizer", git: "https://github.com/OpenSourcePolitics/decidim-module-term_customizer.git", branch: "fix/email_with_precompile"
@@ -44,18 +50,20 @@ gem "faker", "~> 2.14"
 gem "fog-aws"
 gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git"
 gem "letter_opener_web", "~> 1.3"
+gem "multipart-post"
 gem "nokogiri", "1.13.4"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "puma", ">= 5.5.1"
 gem "rack-attack", "~> 6.6"
 gem "sys-filesystem"
+gem "wicked_pdf", "2.6.3"
 
 group :development do
   gem "listen", "~> 3.1"
   gem "rubocop-faker"
   gem "spring", "~> 2.0"
   gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "4.0.4"
+  gem "web-console", "~> 4.1"
 end
 
 group :development, :test do