From cdbec58b0eac937408bca3f59a1414f2a84a5afa Mon Sep 17 00:00:00 2001 From: Simonas Date: Wed, 3 Jan 2024 10:57:42 +0100 Subject: [PATCH 1/5] Bump homepage proposals --- Gemfile.lock | 381 ++++++++++++++++++++++++++------------------------- 1 file changed, 195 insertions(+), 186 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 731cfe7..15a8670 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git - revision: 3bbd5fff51fbfa94ff6e784baa73af190b1c679d + revision: 4e6b7a1a5fcfa0661ba93d1bedb2e09da66d5326 branch: release/0.26-stable specs: decidim-homepage_interactive_map (2.0.0) @@ -44,7 +44,7 @@ GIT GIT remote: https://github.com/alecslupu-pfa/decidim-module-custom_proposal_states - revision: 92b02c1ed2311547b9b4688d16411b4d9be99af6 + revision: 7f915dc83a5bebcfaaed06d90e9ba05e9a67de40 branch: chore/fix-module-dependency specs: decidim-custom_proposal_states (0.26.8) @@ -54,15 +54,15 @@ GIT GIT remote: https://github.com/alecslupu-pfa/decidim-module-slider - revision: 1004d0abff85b74e323d00bc14bd2aa35eb0fdce + revision: 63e29e03b2bc300f4941a079ecb993cab006e254 branch: main specs: - decidim-slider (0.0.2) + decidim-slider (0.0.3) decidim-core (~> 0.26.0) GIT remote: https://github.com/alecslupu-pfa/decidim-module_homepage_proposals - revision: 498631e9a5c2fa1628b25c6d6fecbedd8fc507f9 + revision: 1e5753b2db6caaba5b38c7de7865de8cf22c11db branch: feature/reset-filters specs: decidim-homepage_proposals (1.0.2) @@ -150,9 +150,9 @@ GEM activejob (6.0.6.1) activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activejob-uniqueness (0.2.5) - activejob (>= 4.2, < 7.1) - redlock (>= 1.2, < 2) + activejob-uniqueness (0.3.1) + activejob (>= 4.2, < 7.2) + redlock (>= 2.0, < 3) activemodel (6.0.6.1) activesupport (= 6.0.6.1) activerecord (6.0.6.1) @@ -171,24 +171,24 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.4) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - aws-eventstream (1.2.0) - aws-partitions (1.769.0) - aws-sdk-core (3.173.1) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.876.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.64.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.122.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.7.0) dumb_delegator @@ -201,8 +201,9 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) + base64 (0.2.0) batch-loader (1.5.0) - bcrypt (3.1.18) + bcrypt (3.1.20) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) @@ -212,13 +213,13 @@ GEM parser (>= 2.4) smart_properties bindex (0.8.1) - bootsnap (1.16.0) + bootsnap (1.17.0) msgpack (~> 1.2) brakeman (5.4.1) browser (2.7.1) builder (3.2.4) byebug (11.1.3) - capybara (3.39.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -227,7 +228,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.3) + carrierwave (2.2.5) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) @@ -247,7 +248,7 @@ GEM actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.7) - chef-utils (18.2.7) + chef-utils (18.3.0) concurrent-ruby childprocess (3.0.0) coercible (1.0.0) @@ -261,73 +262,73 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.2.2) connection_pool (2.4.1) - countries (5.4.0) + countries (5.7.1) unaccent (~> 0.3) crack (0.4.5) rexml crass (1.0.6) - css_parser (1.14.0) + css_parser (1.16.0) addressable - dalli (3.2.4) - date (3.3.3) + dalli (3.2.6) + date (3.3.4) date_validator (0.9.0) activemodel activesupport db-query-matchers (0.10.0) activesupport (>= 4.0, < 7) rspec (~> 3.0) - decidim (0.26.7) - decidim-accountability (= 0.26.7) - decidim-admin (= 0.26.7) - decidim-api (= 0.26.7) - decidim-assemblies (= 0.26.7) - decidim-blogs (= 0.26.7) - decidim-budgets (= 0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) - decidim-debates (= 0.26.7) - decidim-forms (= 0.26.7) - decidim-generators (= 0.26.7) - decidim-meetings (= 0.26.7) - decidim-pages (= 0.26.7) - decidim-participatory_processes (= 0.26.7) - decidim-proposals (= 0.26.7) - decidim-sortitions (= 0.26.7) - decidim-surveys (= 0.26.7) - decidim-system (= 0.26.7) - decidim-templates (= 0.26.7) - decidim-verifications (= 0.26.7) - decidim-accountability (0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) - decidim-admin (0.26.7) + decidim (0.26.9) + decidim-accountability (= 0.26.9) + decidim-admin (= 0.26.9) + decidim-api (= 0.26.9) + decidim-assemblies (= 0.26.9) + decidim-blogs (= 0.26.9) + decidim-budgets (= 0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) + decidim-debates (= 0.26.9) + decidim-forms (= 0.26.9) + decidim-generators (= 0.26.9) + decidim-meetings (= 0.26.9) + decidim-pages (= 0.26.9) + decidim-participatory_processes (= 0.26.9) + decidim-proposals (= 0.26.9) + decidim-sortitions (= 0.26.9) + decidim-surveys (= 0.26.9) + decidim-system (= 0.26.9) + decidim-templates (= 0.26.9) + decidim-verifications (= 0.26.9) + decidim-accountability (0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) + decidim-admin (0.26.9) active_link_to (~> 1.0) - decidim-core (= 0.26.7) + decidim-core (= 0.26.9) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-api (0.26.7) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-api (0.26.9) graphql (~> 1.12, < 1.13) rack-cors (~> 1.0) redcarpet (~> 3.5, >= 3.5.1) - decidim-assemblies (0.26.7) - decidim-core (= 0.26.7) - decidim-blogs (0.26.7) - decidim-admin (= 0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) - decidim-budgets (0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) - decidim-comments (0.26.7) - decidim-core (= 0.26.7) + decidim-assemblies (0.26.9) + decidim-core (= 0.26.9) + decidim-blogs (0.26.9) + decidim-admin (= 0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) + decidim-budgets (0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) + decidim-comments (0.26.9) + decidim-core (= 0.26.9) redcarpet (~> 3.5, >= 3.5.1) - decidim-conferences (0.26.7) - decidim-core (= 0.26.7) - decidim-meetings (= 0.26.7) + decidim-conferences (0.26.9) + decidim-core (= 0.26.9) + decidim-meetings (= 0.26.9) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-core (0.26.7) + decidim-core (0.26.9) active_link_to (~> 1.0) acts_as_list (~> 0.9) batch-loader (~> 1.2) @@ -337,7 +338,7 @@ GEM cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) date_validator (~> 0.9.0) - decidim-api (= 0.26.7) + decidim-api (= 0.26.9) devise (~> 4.7) devise-i18n (~> 1.2) diffy (~> 3.3) @@ -379,19 +380,21 @@ GEM valid_email2 (~> 2.1) webpacker (= 6.0.0.rc.5) wisper (~> 2.0) - decidim-debates (0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) - decidim-decidim_awesome (0.9.1) + decidim-debates (0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) + decidim-decidim_awesome (0.10.2) decidim-admin (>= 0.26.0, < 0.28) decidim-core (>= 0.26.0, < 0.28) + deface (>= 1.5) sassc (~> 2.3) - decidim-dev (0.26.7) + decidim-dev (0.26.9) + axe-core-api (~> 4.7.0) axe-core-rspec (~> 4.1.0) byebug (~> 11.0) capybara (~> 3.24) db-query-matchers (~> 0.10.0) - decidim (= 0.26.7) + decidim (= 0.26.9) erb_lint (~> 0.0.35) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) @@ -414,47 +417,47 @@ GEM w3c_rspec_validators (~> 0.3.0) webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.26.7) - decidim-core (= 0.26.7) + decidim-forms (0.26.9) + decidim-core (= 0.26.9) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.26.7) - decidim-core (= 0.26.7) - decidim-meetings (0.26.7) - decidim-core (= 0.26.7) - decidim-forms (= 0.26.7) + decidim-generators (0.26.9) + decidim-core (= 0.26.9) + decidim-meetings (0.26.9) + decidim-core (= 0.26.9) + decidim-forms (= 0.26.9) icalendar (~> 2.5) - decidim-pages (0.26.7) - decidim-core (= 0.26.7) - decidim-participatory_processes (0.26.7) - decidim-core (= 0.26.7) - decidim-proposals (0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) + decidim-pages (0.26.9) + decidim-core (= 0.26.9) + decidim-participatory_processes (0.26.9) + decidim-core (= 0.26.9) + decidim-proposals (0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) doc2text (~> 0.4.4) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.26.7) - decidim-admin (= 0.26.7) - decidim-comments (= 0.26.7) - decidim-core (= 0.26.7) - decidim-proposals (= 0.26.7) + decidim-sortitions (0.26.9) + decidim-admin (= 0.26.9) + decidim-comments (= 0.26.9) + decidim-core (= 0.26.9) + decidim-proposals (= 0.26.9) decidim-spam_detection (3.1.0) decidim-core (~> 0.26.0) - decidim-surveys (0.26.7) - decidim-core (= 0.26.7) - decidim-forms (= 0.26.7) - decidim-templates (= 0.26.7) - decidim-system (0.26.7) + decidim-surveys (0.26.9) + decidim-core (= 0.26.9) + decidim-forms (= 0.26.9) + decidim-templates (= 0.26.9) + decidim-system (0.26.9) active_link_to (~> 1.0) - decidim-core (= 0.26.7) + decidim-core (= 0.26.9) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-templates (0.26.7) - decidim-core (= 0.26.7) - decidim-forms (= 0.26.7) - decidim-verifications (0.26.7) - decidim-core (= 0.26.7) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-templates (0.26.9) + decidim-core (= 0.26.9) + decidim-forms (= 0.26.9) + decidim-verifications (0.26.9) + decidim-core (= 0.26.9) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -466,15 +469,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) @@ -483,7 +486,7 @@ GEM nokogiri (>= 1.13.2, < 1.15.0) rubyzip (~> 2.3.0) docile (1.4.0) - doorkeeper (5.6.6) + doorkeeper (5.6.8) railties (>= 5) doorkeeper-i18n (4.0.1) dotenv (2.8.1) @@ -505,8 +508,8 @@ GEM erubi (1.12.0) et-orbi (1.2.7) tzinfo - excon (0.99.0) - execjs (2.8.1) + excon (0.108.0) + execjs (2.9.1) factory_bot (4.11.1) activesupport (>= 3.0.0) factory_bot_rails (4.11.1) @@ -514,15 +517,16 @@ GEM railties (>= 3.0.0) faker (2.23.0) i18n (>= 1.8.11, < 2) - faraday (2.7.5) + faraday (2.8.1) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - ffi (1.15.5) + ffi (1.16.3) file_validators (2.3.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-aws (3.19.0) + fog-aws (3.21.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -540,20 +544,20 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (1.1.0) - fugit (1.8.1) + fugit (1.9.0) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) geocoder (1.7.5) globalid (1.1.0) activesupport (>= 5.0) graphql (1.12.24) - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) highline (2.1.0) hiredis (0.6.3) html_tokenizer (0.0.7) htmlentities (4.3.4) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) i18n-tasks (0.9.37) activesupport (>= 4.0.2) @@ -565,7 +569,7 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.8.0) + icalendar (2.10.1) ice_cube (~> 0.16) ice_cube (0.16.4) ice_nine (0.11.2) @@ -575,7 +579,7 @@ GEM invisible_captcha (0.13.0) rails (>= 3.2.0) jmespath (1.6.2) - json (2.6.3) + json (2.7.1) jwt (2.5.0) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -604,7 +608,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lograge (0.12.0) + lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -619,39 +623,39 @@ 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) mixlib-config (>= 2.2.1, < 4) mixlib-shellout method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) + mime-types-data (3.2023.1205) mini_magick (4.12.0) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.0) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + minitest (5.20.0) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb mixlib-shellout (3.2.7) chef-utils - msgpack (1.7.1) + msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) - net-imap (0.3.4) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -670,7 +674,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - omniauth (2.1.1) + omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -700,10 +704,11 @@ GEM paper_trail (12.3.0) activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.23.0) - parser (3.2.2.1) + parallel (1.24.0) + parser (3.2.2.4) ast (~> 2.4.1) - passenger (6.0.17) + racc + passenger (6.0.19) rack rake (>= 0.8.1) pg (1.1.4) @@ -711,7 +716,7 @@ GEM activerecord (>= 5.2) activesupport (>= 5.2) polyglot (0.3.5) - premailer (1.21.0) + premailer (1.22.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) @@ -719,19 +724,20 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (5.0.1) - puma (5.6.5) + public_suffix (5.0.4) + puma (5.6.7) nio4r (~> 2.0) raabro (1.4.0) - racc (1.6.2) - rack (2.2.7) - rack-attack (6.6.1) - rack (>= 1.0, < 3) + racc (1.7.3) + rack (2.2.8) + rack-attack (6.7.0) + rack (>= 1.0, < 4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-protection (3.0.6) - rack - rack-proxy (0.7.6) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) @@ -754,8 +760,9 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) @@ -769,7 +776,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.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) @@ -785,16 +792,18 @@ GEM wisper (>= 1.6.1) redcarpet (3.6.0) redis (4.8.1) - redlock (1.3.2) - redis (>= 3.0.0, < 6.0) - regexp_parser (2.8.0) - repost (0.4.1) + redis-client (0.19.1) + connection_pool + redlock (2.0.6) + redis-client (>= 0.14.1, < 1.0.0) + regexp_parser (2.8.3) + repost (0.4.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.5) + rexml (3.2.6) rgeo (2.4.0) rgeo-proj4 (3.1.1) rgeo (~> 2.0) @@ -802,9 +811,9 @@ GEM rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-cells (0.3.8) + rspec-cells (0.3.9) cells (>= 4.0.0, < 6.0.0) - rspec-rails (>= 3.0.0, < 6.1.0) + rspec-rails (>= 3.0.0, < 6.2.0) rspec-core (3.12.2) rspec-support (~> 3.12.0) rspec-expectations (3.12.3) @@ -813,7 +822,7 @@ GEM rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (4.1.2) @@ -826,7 +835,7 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.0) + rspec-support (3.12.1) rspec_junit_formatter (0.3.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (0.92.0) @@ -838,7 +847,7 @@ GEM rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.28.1) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-faker (1.1.0) faker (>= 2.12.0) @@ -853,14 +862,14 @@ GEM ruby-saml (1.14.0) nokogiri (>= 1.10.5) rexml - ruby-vips (2.1.4) + ruby-vips (2.2.0) ffi (~> 1.12) ruby2_keywords (0.0.5) rubyXL (3.4.25) nokogiri (>= 1.10.8) rubyzip (>= 1.3.0) rubyzip (2.3.2) - rufus-scheduler (3.8.2) + rufus-scheduler (3.9.1) fugit (~> 1.1, >= 1.1.6) sassc (2.4.0) ffi (~> 1.9) @@ -869,20 +878,20 @@ GEM childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) semantic_range (3.0.0) - sentry-rails (5.9.0) + sentry-rails (5.15.2) railties (>= 5.0) - sentry-ruby (~> 5.9.0) - sentry-ruby (5.9.0) + sentry-ruby (~> 5.15.2) + sentry-ruby (5.15.2) concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.9.0) - sentry-ruby (~> 5.9.0) + sentry-sidekiq (5.15.2) + sentry-ruby (~> 5.15.2) sidekiq (>= 3.0) seven_zip_ruby (1.3.0) - sidekiq (6.5.8) + sidekiq (6.5.12) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) - sidekiq-scheduler (5.0.2) + sidekiq-scheduler (5.0.3) rufus-scheduler (~> 3.2) sidekiq (>= 6, < 8) tilt (>= 1.4.0) @@ -902,25 +911,25 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - ssrf_filter (1.1.1) - sys-filesystem (1.4.3) + ssrf_filter (1.1.2) + sys-filesystem (1.4.4) ffi (~> 1.1) system_test_html_screenshots (0.2.0) actionpack (>= 5.2, < 6.1.a) - temple (0.10.1) + 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.1.0) - timeout (0.3.2) + tilt (2.3.0) + timeout (0.4.1) tomlrb (2.0.3) twilio-ruby (5.72.1) faraday (>= 0.9, < 3.0) @@ -936,7 +945,7 @@ GEM valid_email2 (2.3.1) activemodel (>= 3.2) mail (~> 2.5) - version_gem (1.1.2) + version_gem (1.1.3) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -957,7 +966,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.18.1) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -966,17 +975,17 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - 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.8) + zeitwerk (2.6.12) PLATFORMS arm64-darwin-22 @@ -1038,4 +1047,4 @@ RUBY VERSION ruby 2.7.7p221 BUNDLED WITH - 2.3.4 + 2.4.22 From 625b0b5927aaeec0a97cdc9dac276eaa540cb615 Mon Sep 17 00:00:00 2001 From: Quentin Champenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:44:32 +0100 Subject: [PATCH 2/5] Update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 15a8670..6559db0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1047,4 +1047,4 @@ RUBY VERSION ruby 2.7.7p221 BUNDLED WITH - 2.4.22 + 2.3.4 From 07bee4d391505d234608b7cf52d9a29eeb00e363 Mon Sep 17 00:00:00 2001 From: Quentin Champenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:52:08 +0100 Subject: [PATCH 3/5] fix: downgrade net-imap --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6559db0..99a136a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -646,7 +646,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) - net-imap (0.4.9) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) From 8e432064843004eb9ff58618bc5d562b11fdce34 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:09:22 +0100 Subject: [PATCH 4/5] fix: Add missing decidim-awesome migrations --- ..._value_for_decidim_endorsements.decidim.rb | 12 +++++++++++ ...me_vote_weights.decidim_decidim_awesome.rb | 14 +++++++++++++ ...al_extra_fields.decidim_decidim_awesome.rb | 15 +++++++++++++ db/schema.rb | 21 +++++++++++++++++-- 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb create mode 100644 db/migrate/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb create mode 100644 db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb diff --git a/db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb b/db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb new file mode 100644 index 0000000..6a87068 --- /dev/null +++ b/db/migrate/20240103110734_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.0] + 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/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb b/db/migrate/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb new file mode 100644 index 0000000..64482b4 --- /dev/null +++ b/db/migrate/20240103110735_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/db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb b/db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb new file mode 100644 index 0000000..781fd3f --- /dev/null +++ b/db/migrate/20240103110736_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 diff --git a/db/schema.rb b/db/schema.rb index 38df89b..ccaad8a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_12_21_231806) do +ActiveRecord::Schema.define(version: 2024_01_03_110736) do # These are extensions that must be enabled in order to support this database enable_extension "ltree" @@ -315,6 +315,23 @@ t.index ["decidim_organization_id"], name: "decidim_awesome_editor_images_constraint_organization" end + create_table "decidim_awesome_proposal_extra_fields", force: :cascade do |t| + t.bigint "decidim_proposal_id", null: false + t.jsonb "vote_weight_totals" + t.integer "weight_total", default: 0 + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["decidim_proposal_id"], name: "decidim_awesome_extra_fields_on_proposal" + end + + create_table "decidim_awesome_vote_weights", force: :cascade do |t| + t.bigint "proposal_vote_id", null: false + t.integer "weight", default: 1, null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["proposal_vote_id"], name: "decidim_awesome_proposals_weights_vote" + end + create_table "decidim_blogs_posts", id: :serial, force: :cascade do |t| t.jsonb "title" t.jsonb "body" @@ -731,7 +748,7 @@ t.bigint "resource_id" t.string "decidim_author_type" t.bigint "decidim_author_id" - t.integer "decidim_user_group_id" + t.integer "decidim_user_group_id", default: 0 t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_author_type", "decidim_author_id"], name: "idx_endorsements_authors" From 1840de1d76a3e100e073c5f2dba8007223548394 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:13:29 +0100 Subject: [PATCH 5/5] lint: Fix rubocop offenses --- ...0734_change_default_value_for_decidim_endorsements.decidim.rb | 1 + ...reate_decidim_awesome_vote_weights.decidim_decidim_awesome.rb | 1 + ...idim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb | 1 + 3 files changed, 3 insertions(+) diff --git a/db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb b/db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb index 6a87068..be91c9d 100644 --- a/db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb +++ b/db/migrate/20240103110734_change_default_value_for_decidim_endorsements.decidim.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim (originally 20231027142329) class ChangeDefaultValueForDecidimEndorsements < ActiveRecord::Migration[6.0] diff --git a/db/migrate/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb b/db/migrate/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb index 64482b4..e23875c 100644 --- a/db/migrate/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb +++ b/db/migrate/20240103110735_create_decidim_awesome_vote_weights.decidim_decidim_awesome.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim_decidim_awesome (originally 20231006113837) class CreateDecidimAwesomeVoteWeights < ActiveRecord::Migration[6.0] diff --git a/db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb b/db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb index 781fd3f..76a1d2e 100644 --- a/db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb +++ b/db/migrate/20240103110736_create_decidim_awesome_proposal_extra_fields.decidim_decidim_awesome.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim_decidim_awesome (originally 20231006113841) class CreateDecidimAwesomeProposalExtraFields < ActiveRecord::Migration[6.0]