fix: Merge develop x master (#501)

* fix: Merge develop x master * fix: Update .env-example * fix: Install gem dependencies * lint: Fix rubocop offense * feat: Add x86_64 linux support * fix: Downgrade to Decidim 0.27.4
OpenSourcePolitics · Feb 22, 2024 · 075626c · 075626c
1 parent 1b08cb4
commit 075626c
Show file tree

Hide file tree

Showing 22 changed files with 3,387 additions and 69 deletions.
diff --git a/.env-example b/.env-example
@@ -79,4 +79,5 @@ DECIDIM_ADMIN_PASSWORD_STRONG="false"
 ## Push notifications (enable when set)
 ## Generate values with: bin/rails decidim:pwa:generate_vapid_keys
 # VAPID_PUBLIC_KEY
-# VAPID_PRIVATE_KEY
+# VAPID_PRIVATE_KEY
+RAILS_LOG_LEVEL=warn
diff --git a/Gemfile b/Gemfile
@@ -25,7 +25,7 @@ gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolit
 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-spam_detection"
-gem "decidim-survey_multiple_answers", git: "https://github.com/alecslupu-pfa/decidim-module-survey_multiple_answers"
+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"
 
 # Omniauth gems

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -42,6 +42,16 @@ GIT
       rgeo (~> 2.4)
       rgeo-proj4 (~> 3.1)
 
+GIT
+  remote: https://github.com/OpenSourcePolitics/decidim-module-survey_multiple_answers
+  revision: 65ea83227f99d0f3d6237f98334ecc914a2a5597
+  specs:
+    decidim-survey_multiple_answers (0.26.2)
+      decidim-admin (>= 0.26.0, < 0.28.0)
+      decidim-core (>= 0.26.0, < 0.28.0)
+      decidim-forms (>= 0.26.0, < 0.28.0)
+      decidim-surveys (>= 0.26.0, < 0.28.0)
+
 GIT
   remote: https://github.com/OpenSourcePolitics/decidim-module-term_customizer.git
   revision: bfb4ba25dcfe504c9c9d7afd376c04c28cb23ce8
@@ -84,16 +94,6 @@ GIT
       decidim-core (>= 0.27.0, < 0.28)
       deface (~> 1.5)
 
-GIT
-  remote: https://github.com/alecslupu-pfa/decidim-module-survey_multiple_answers
-  revision: 65ea83227f99d0f3d6237f98334ecc914a2a5597
-  specs:
-    decidim-survey_multiple_answers (0.26.2)
-      decidim-admin (>= 0.26.0, < 0.28.0)
-      decidim-core (>= 0.26.0, < 0.28.0)
-      decidim-forms (>= 0.26.0, < 0.28.0)
-      decidim-surveys (>= 0.26.0, < 0.28.0)
-
 GIT
   remote: https://github.com/sgruhier/foundation_rails_helper.git
   revision: bc33600db7a2d16ce3cdc1f8369d0d7e7c4245b5
@@ -107,7 +107,6 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    abbrev (0.1.2)
     actioncable (6.1.7.6)
       actionpack (= 6.1.7.6)
       activesupport (= 6.1.7.6)
@@ -188,22 +187,22 @@ GEM
     ast (2.4.2)
     attr_required (1.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.882.0)
-    aws-sdk-core (3.190.3)
+    aws-partitions (1.894.0)
+    aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.76.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.8.1)
+    axe-core-api (4.8.2)
       dumb_delegator
       virtus
     axe-core-rspec (4.1.0)
@@ -225,19 +224,20 @@ GEM
       html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
-    bindata (2.4.15)
+    bigdecimal (3.1.6)
+    bindata (2.5.0)
     bindex (0.8.1)
-    bootsnap (1.17.1)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     brakeman (5.4.1)
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -263,7 +263,7 @@ GEM
       cells (>= 4.1.6, < 5.0.0)
     cgi (0.4.1)
     charlock_holmes (0.7.7)
-    chef-utils (18.3.0)
+    chef-utils (18.4.2)
       concurrent-ruby
     childprocess (4.1.0)
     climate_control (1.2.0)
@@ -287,12 +287,13 @@ GEM
     country_select (4.0.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.0)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
     css_parser (1.16.0)
       addressable
-    dalli (3.2.6)
+    dalli (3.2.8)
     date (3.3.4)
     date_validator (0.12.0)
       activemodel (>= 3)
@@ -514,13 +515,13 @@ GEM
     devise_invitable (2.0.9)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     diffy (3.4.2)
-    doc2text (0.4.6)
-      nokogiri (>= 1.13.2, < 1.15.0)
+    doc2text (0.4.7)
+      nokogiri (>= 1.13.2, < 1.17.0)
       rubyzip (~> 2.3.0)
     docile (1.4.0)
-    doorkeeper (5.6.8)
+    doorkeeper (5.6.9)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     dotenv (2.8.1)
@@ -601,8 +602,7 @@ GEM
     hashie (5.0.0)
     health_check (3.1.0)
       railties (>= 5.0)
-    highline (3.0.0)
-      abbrev
+    highline (3.0.1)
     hkdf (0.3.0)
     html-pipeline (2.14.3)
       activesupport (>= 2)
@@ -641,7 +641,8 @@ GEM
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    jwt (2.7.1)
+    jwt (2.8.0)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -660,7 +661,7 @@ GEM
       kramdown (~> 2.0)
     launchy (2.5.2)
       addressable (~> 2.8)
-    letter_opener (1.8.1)
+    letter_opener (1.9.0)
       launchy (>= 2.2, < 3)
     letter_opener_web (1.4.1)
       actionmailer (>= 3.2)
@@ -693,10 +694,10 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.0206)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.21.2)
+    minitest (5.22.2)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
@@ -708,7 +709,7 @@ GEM
     mustache (1.1.1)
     net-http (0.4.1)
       uri
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -720,8 +721,6 @@ GEM
     nio4r (2.7.0)
     nokogiri (1.13.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-darwin)
-      racc (~> 1.4)
     nokogiri (1.13.4-x86_64-linux)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -784,7 +783,7 @@ GEM
     parallel (1.24.0)
     parallel_tests (3.13.0)
       parallel
-    parser (3.3.0.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pg (1.1.4)
@@ -868,7 +867,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    redis-client (0.19.1)
+    redis-client (0.20.0)
       connection_pool
     redlock (2.0.6)
       redis-client (>= 0.14.1, < 1.0.0)
@@ -882,24 +881,24 @@ GEM
     rgeo (2.4.0)
     rgeo-proj4 (3.1.1)
       rgeo (~> 2.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
     rspec-cells (0.3.9)
       cells (>= 4.0.0, < 6.0.0)
       rspec-rails (>= 3.0.0, < 6.2.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (4.1.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
@@ -910,7 +909,7 @@ GEM
       rspec-support (~> 3.10)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.1)
+    rspec-support (3.13.0)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.28.2)
@@ -934,7 +933,7 @@ GEM
     rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.0)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
     rubyXL (3.4.25)
       nokogiri (>= 1.10.8)
@@ -1056,7 +1055,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.19.1)
+    webmock (3.22.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -1073,18 +1072,17 @@ GEM
     websocket-extensions (0.1.5)
     wicked (1.4.0)
       railties (>= 3.0.7)
-    wicked_pdf (2.6.3)
+    wicked_pdf (2.7.0)
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
     wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-22
-  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES

diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ You can find below an exhaustive list of modules with their repository links and
 | [decidim-gallery](https://github.com/alecslupu-pfa/decidim-module-gallery)                                              | ✅       | Module allowing the creation of galleries                                                                                                                                    |
 | [decidim-extra_user_fields](https://github.com/PopulateTools/decidim-module-extra_user_fields)                                                | ✅       | Module allowing the creation of new fields in users form                                                                                                                     |
 
-
 Some non-official customizations can be found see [OVERLOADS.MD](./OVERLOADS.md).
 
 ## 🚀 Getting started

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -56,7 +56,8 @@
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = :info
+  # The available log levels are: :debug, :info, :warn, :error, :fatal, and :unknown
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "warn").to_sym
 
   # Prepend all log lines with the following tags.
   config.log_tags = [:request_id]

diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
@@ -3,3 +3,4 @@
 require "extends/controllers/decidim/devise/account_controller_extends"
 require "extends/cells/decidim/content_blocks/hero_cell_extends"
 require "extends/uploaders/decidim/application_uploader_extends"
+require "extends/lib/decidim/proposals/imports/proposal_answer_creator_extends"
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb
@@ -17,7 +17,7 @@
   config.include_error_in_response_body = false
 
   # Log level (success or failure message with error details is sent to rails log unless this is set to nil)
-  config.log_level = "info"
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "warn").to_sym
 
   # Timeout in seconds used when checking smtp server
   config.smtp_timeout = 30.0

diff --git a/config/locales/bg.decidim-comments.yml b/config/locales/bg.decidim-comments.yml
@@ -58,7 +58,7 @@ bg:
             offensive: Съдържа дискриминация на расова основа, дискриминация на полова основа, клевети, лични нападки, заплахи за убийство, заплахи за самоубийство или каквато и да е форма на изказвания, проповядващи вражда и омраза.
             spam: Съдържа кликбейт, реклами, измами или скрипт ботове.
           title: Подаване на сигнал за неподходящо съдържание
-        show_replies: Показване на %{replies_count} отговора
+        show_replies: Показване на %{count} отговора
         single_comment_link_title: Получи линк
       comment_order_selector:
         order:

diff --git a/config/locales/cs.decidim-comments.yml b/config/locales/cs.decidim-comments.yml
@@ -62,7 +62,7 @@ cs:
             offensive: Obsahuje rasismus, sexismus, urážky, osobní útoky, výhružky smrtí, výzvy k sebevraždě nebo jakoukoliv jinou formu projevu nenávisti.
             spam: Obsahuje clickbait, reklamu, podvody nebo skripty.
           title: Nahlásit nevhodný obsah
-        show_replies: Zobrazit %{replies_count} odpovědí
+        show_replies: Zobrazit %{count} odpovědí
         single_comment_link_title: Použit odkaz
       comment_order_selector:
         order:

diff --git a/config/locales/da.decidim-comments.yml b/config/locales/da.decidim-comments.yml
@@ -58,7 +58,7 @@ da:
             offensive: Indeholder racisme, sexisme, bagtalelse, personlige angreb, dødstrusler, selvmordsanmodninger eller hadtale i enhver form.
             spam: Indeholder kliklokkemad, reklamer, svindelnumre eller script-bots.
           title: Indberetning af upassende indhold
-        show_replies: Vis %{replies_count} svar
+        show_replies: Vis %{count} svar
         single_comment_link_title: Hent link
       comment_order_selector:
         order:

diff --git a/config/locales/el.decidim-comments.yml b/config/locales/el.decidim-comments.yml
@@ -58,7 +58,7 @@ el:
             offensive: Περιέχει ρατσιστικά ή σεξιστικά στοιχεία, συκοφαντίες, προσωπικές επιθέσεις, απειλές κατά ζωής, τάσεις αυτοκτονίας ή οποιαδήποτε μορφή ρητορικής μίσους.
             spam: Περιέχει «δόλωμα για κλικ» (clickbait), διαφημίσεις, απάτες ή bot δέσμης ενεργειών.
           title: Αναφορά ακατάλληλου περιεχομένου
-        show_replies: Εμφάνιση %{replies_count} απαντήσεων
+        show_replies: Εμφάνιση %{count} απαντήσεων
         single_comment_link_title: Δημιουργία συνδέσμου
       comment_order_selector:
         order:

diff --git a/config/locales/et.decidim-comments.yml b/config/locales/et.decidim-comments.yml
@@ -58,7 +58,7 @@ et:
             offensive: 'Sisu hõlmab järgmist: rassism, seksism, solvangud, isiklikud rünnakud, tapmisähvardused, enesetapule õhutamine või mis tahes kujul vihakõne.'
             spam: Hõlmab klõpsusööta, reklaame, petuskeeme või skriptiroboteid.
           title: Teata sobimatust sisust
-        show_replies: Kuva %{replies_count} vastust
+        show_replies: Kuva %{count} vastust
         single_comment_link_title: Saa link
       comment_order_selector:
         order: