updgrade packages

Som-Energia · Nov 14, 2023 · 8ae149a · 8ae149a
1 parent 382595c
commit 8ae149a
Show file tree

Hide file tree

Showing 9 changed files with 1,081 additions and 887 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,10 @@
 FROM ruby:3.0 AS builder
 
-RUN apt-get update && apt-get upgrade -y && apt-get install gnupg2 && \
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+RUN NODE_MAJOR=16 && \
+    apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl gnupg && \
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
     curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get update && apt-get install -y nodejs yarn \

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -29,16 +29,17 @@ GIT
 
 GIT
   remote: https://github.com/decidim-ice/decidim-module-decidim_awesome.git
-  revision: 25d2e7f81904619802bc6edd1a84c464ede05327
+  revision: 4f1b2eb8a9db544e3f781a248cc5b3659e808a36
   specs:
-    decidim-decidim_awesome (0.9.3)
+    decidim-decidim_awesome (0.10.0)
       decidim-admin (>= 0.26.0, < 0.28)
       decidim-core (>= 0.26.0, < 0.28)
+      deface (>= 1.5)
       sassc (~> 2.3)
 
 GIT
   remote: https://github.com/decidim/decidim.git
-  revision: 2d0a1fe016da514c4b8df974b949230d958186a2
+  revision: 17300e07674f3b940127dbab1b29532e807fd089
   branch: release/0.27-stable
   specs:
     decidim (0.27.4)
@@ -70,7 +71,7 @@ GIT
       decidim-core (= 0.27.4)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
-      devise_invitable (~> 2.0)
+      devise_invitable (~> 2.0, >= 2.0.9)
     decidim-api (0.27.4)
       graphql (~> 1.12, < 1.13)
       graphql-docs (~> 2.1.0)
@@ -216,7 +217,7 @@ GIT
       decidim-core (= 0.27.4)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
-      devise_invitable (~> 2.0)
+      devise_invitable (~> 2.0, >= 2.0.9)
     decidim-templates (0.27.4)
       decidim-core (= 0.27.4)
       decidim-forms (= 0.27.4)
@@ -234,9 +235,9 @@ GIT
 
 GIT
   remote: https://github.com/openpoke/decidim-module-reporting-proposals.git
-  revision: 5abb574cd9644bb55bb7728e5bf9800c512b92aa
+  revision: 899e38c7cb4496102617f266f0e640659e987839
   specs:
-    decidim-reporting_proposals (0.5.1)
+    decidim-reporting_proposals (0.5.2)
       decidim-admin (>= 0.27.0, < 0.28)
       decidim-core (>= 0.27.0, < 0.28)
       decidim-participatory_processes (>= 0.27.0, < 0.28)
@@ -318,22 +319,22 @@ GEM
       nokogiri
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.828.0)
-    aws-sdk-core (3.183.1)
+    aws-partitions (1.849.0)
+    aws-sdk-core (3.186.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.72.0)
+      aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.136.0)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.7.0)
+    axe-core-api (4.8.0)
       dumb_delegator
       virtus
     axe-core-rspec (4.1.0)
@@ -344,7 +345,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    base64 (0.1.1)
+    base64 (0.2.0)
     batch-loader (1.5.0)
     bcrypt (3.1.19)
     better_html (1.0.16)
@@ -356,7 +357,7 @@ GEM
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    bootsnap (1.16.0)
+    bootsnap (1.17.0)
       msgpack (~> 1.2)
     brakeman (6.0.1)
     browser (2.7.1)
@@ -412,7 +413,7 @@ GEM
     crass (1.0.6)
     css_parser (1.16.0)
       addressable
-    date (3.3.3)
+    date (3.3.4)
     date_validator (0.12.0)
       activemodel (>= 3)
       activesupport (>= 3)
@@ -430,15 +431,15 @@ GEM
       rainbow (>= 2.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.11.0)
+    devise-i18n (1.12.0)
       devise (>= 4.9.0)
-    devise_invitable (2.0.8)
+    devise_invitable (2.0.9)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.0)
@@ -465,7 +466,7 @@ GEM
     escape_utils (1.3.0)
     et-orbi (1.2.7)
       tzinfo
-    excon (0.103.0)
+    excon (0.104.0)
     execjs (2.9.1)
     extended-markdown-filter (0.7.0)
       html-pipeline (~> 2.9)
@@ -474,14 +475,14 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (3.2.1)
+    faker (3.2.2)
       i18n (>= 1.8.11, < 2)
     faraday (2.7.11)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.16.2)
+    ffi (1.16.3)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
@@ -498,7 +499,7 @@ GEM
       activemodel (>= 4.1, < 7.1)
       activesupport (>= 4.1, < 7.1)
       railties (>= 4.1, < 7.1)
-    fugit (1.8.1)
+    fugit (1.9.0)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     gemoji (3.0.1)
@@ -540,7 +541,7 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    icalendar (2.9.0)
+    icalendar (2.10.0)
       ice_cube (~> 0.16)
     ice_cube (0.16.4)
     ice_nine (0.11.2)
@@ -590,7 +591,7 @@ GEM
       net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
-    mdl (0.12.0)
+    mdl (0.13.0)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       mixlib-cli (~> 2.1, >= 2.1.1)
@@ -599,7 +600,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
+    mime-types-data (3.2023.1003)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
@@ -611,12 +612,12 @@ GEM
     msgpack (1.7.2)
     multi_xml (0.6.0)
     mustache (1.1.1)
-    net-imap (0.3.7)
+    net-imap (0.4.5)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
       net-protocol
@@ -673,7 +674,7 @@ GEM
     parallel (1.23.0)
     parallel_tests (3.13.0)
       parallel
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.1.4)
@@ -694,7 +695,7 @@ GEM
     puma (5.6.7)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
@@ -741,7 +742,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
@@ -751,12 +752,12 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    redis-client (0.17.0)
+    redis-client (0.18.0)
       connection_pool
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
@@ -800,7 +801,7 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
@@ -812,7 +813,7 @@ GEM
     rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyXL (3.4.25)
@@ -843,12 +844,12 @@ GEM
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
     seven_zip_ruby (1.3.0)
-    sidekiq (7.1.4)
+    sidekiq (7.2.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.14.0)
-    sidekiq-cron (1.10.1)
+    sidekiq-cron (1.11.0)
       fugit (~> 1.8)
       globalid (>= 1.0.1)
       sidekiq (>= 6)
@@ -867,7 +868,7 @@ GEM
       version_gem (~> 1.1, >= 1.1.1)
     social-share-button (1.2.4)
       coffee-rails
-    spring (4.1.1)
+    spring (4.1.2)
     spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
       spring (>= 4)
@@ -879,22 +880,22 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    temple (0.10.2)
+    temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     thread_safe (0.3.6)
     tilt (2.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     tomlrb (2.0.3)
-    twilio-ruby (6.7.0)
+    twilio-ruby (6.8.1)
       faraday (>= 0.9, < 3.0)
       jwt (>= 1.5, < 3.0)
       nokogiri (>= 1.6, < 2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
@@ -989,4 +990,4 @@ RUBY VERSION
    ruby 3.0.6p216
 
 BUNDLED WITH
-   2.3.24
+   2.4.21
diff --git a/app/views/static/api/docs/object/proposal/index.html b/app/views/static/api/docs/object/proposal/index.html
@@ -272,6 +272,12 @@ <h2>
   <div class="description-wrapper">
    <p>The total amount of votes the proposal has received</p>
   </div>
+</div>
+<div class="field-entry ">
+  <span id="voteweights" class="field-name anchored">voteWeights (<code><a href="/api/docs/scalar/json">JSON</a></code>)</span>
+  <div class="description-wrapper">
+   <p>The corresponding weights count to the proposal votes</p>
+  </div>
 </div></div>
 <div id="sidebar"><ul class="categories">
   <li>

diff --git a/db/migrate/20231114192302_change_default_value_for_decidim_endorsements.decidim.rb b/db/migrate/20231114192302_change_default_value_for_decidim_endorsements.decidim.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# This migration comes from decidim (originally 20231027142329)
+
+class ChangeDefaultValueForDecidimEndorsements < ActiveRecord::Migration[6.1]
+  def up
+    change_column_default :decidim_endorsements, :decidim_user_group_id, 0
+  end
+
+  def down
+    change_column_default :decidim_endorsements, :decidim_user_group_id, nil
+  end
+end
diff --git a/db/migrate/20231114192359_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb b/db/migrate/20231114192359_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+# This migration comes from decidim_decidim_awesome (originally 20231006113837)
+
+class CreateDecidimAwesomeVoteWeights < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_awesome_vote_weights do |t|
+      # this might be polymorphic in the future (if other types of votes are supported)
+      t.references :proposal_vote, null: false, index: { name: "decidim_awesome_proposals_weights_vote" }
+
+      t.integer :weight, null: false, default: 1
+      t.timestamps
+    end
+  end
+end
diff --git a/...te/20231114192360_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb b/...te/20231114192360_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# This migration comes from decidim_decidim_awesome (originally 20231006113841)
+
+class CreateDecidimAwesomeProposalExtraFields < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_awesome_proposal_extra_fields do |t|
+      # this might be polymorphic in the future (if other types of votes are supported)
+      t.references :decidim_proposal, null: false, index: { name: "decidim_awesome_extra_fields_on_proposal" }
+
+      t.jsonb :vote_weight_totals
+      t.integer :weight_total, default: 0
+      t.timestamps
+    end
+  end
+end