From 90d6786c5f02445d0bc9c39a9fc8039448d49f08 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Wed, 9 Oct 2024 16:20:18 +0200 Subject: [PATCH 01/20] Add term_customizer gem and fix versioning of other modules --- Gemfile | 8 +- Gemfile.lock | 445 +++++++++++++++++++++++----------------------- package-lock.json | 154 ++++++++-------- package.json | 4 +- 4 files changed, 315 insertions(+), 296 deletions(-) diff --git a/Gemfile b/Gemfile index 1669832..1437011 100644 --- a/Gemfile +++ b/Gemfile @@ -11,11 +11,13 @@ gem "decidim-consultations", DECIDIM_VERSION gem "decidim-catcomu_managers", path: "./decidim-module-catcomu_managers" -gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing" +gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing", branch: "release/0.27-stable" gem "decidim-civicrm", git: "https://github.com/Platoniq/decidim-module-civicrm" +gem "decidim-core", DECIDIM_VERSION gem "decidim-decidim_awesome", "~> 0.10.2" gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications" -gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps" +gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps", branch: "release/0.27-stable" +gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "release/0.27-stable" gem "bootsnap", "~> 1.11.0" gem "health_check" @@ -36,7 +38,7 @@ end group :development do gem "letter_opener_web", "~> 1.3" gem "listen", "~> 3.1" - gem "spring", "~> 2.0" + gem "spring", "4.0" gem "spring-watcher-listen", "~> 2.0" gem "web-console" end diff --git a/Gemfile.lock b/Gemfile.lock index e6dd90d..995a0b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GIT remote: https://github.com/Platoniq/decidim-module-alternative_landing - revision: 896b49d4b40111adbee971cbe8fda4c0047d3fbc + revision: 6de8c0dc3c4177ad0f85937835ecf0f49fb8365b + branch: release/0.27-stable specs: decidim-alternative_landing (0.4.0) decidim-admin (>= 0.27.0, < 0.28) @@ -9,7 +10,7 @@ GIT GIT remote: https://github.com/Platoniq/decidim-module-civicrm - revision: fcfe186e5ff56d9fb7d58b5754c4bff66db075c4 + revision: a62627b3658cf8adb2cb100041520731a6f672a1 specs: decidim-civicrm (0.27.3) decidim-admin (~> 0.27.3) @@ -19,6 +20,7 @@ GIT GIT remote: https://github.com/Platoniq/decidim-module-navigation_maps revision: 52c7f017ea5e3b3e817b411a6bb445800c45dda7 + branch: release/0.27-stable specs: decidim-navigation_maps (1.4.0) decidim-admin (>= 0.27, < 0.28) @@ -32,6 +34,15 @@ GIT decidim-admin (>= 0.27.0, < 0.28) decidim-core (>= 0.27.0, < 0.28) +GIT + remote: https://github.com/mainio/decidim-module-term_customizer + revision: abbf0c69e1bcaafebc5aa4f8da22fdb64ce62149 + branch: release/0.27-stable + specs: + decidim-term_customizer (0.27.0) + decidim-admin (~> 0.27.0) + decidim-core (~> 0.27.0) + PATH remote: decidim-module-catcomu_managers specs: @@ -42,41 +53,40 @@ PATH 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) + actioncable (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailbox (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailer (6.1.7.8) + actionpack (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actiontext (6.1.7.8) + actionpack (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -84,22 +94,22 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + activejob (6.1.7.8) + activesupport (= 6.1.7.8) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activestorage (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activesupport (= 6.1.7.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.6) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -107,26 +117,26 @@ GEM zeitwerk (~> 2.3) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) - aws-eventstream (1.2.0) - aws-partitions (1.841.0) - aws-sdk-core (3.185.1) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.987.0) + aws-sdk-core (3.209.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - 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.94.0) + aws-sdk-core (~> 3, >= 3.207.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.167.0) + aws-sdk-core (~> 3, >= 3.207.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.0) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.8.0) + axe-core-api (4.10.0) dumb_delegator virtus axe-core-rspec (4.1.0) @@ -148,22 +158,23 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties + bigdecimal (3.1.8) bindex (0.8.1) bootsnap (1.11.1) msgpack (~> 1.2) browser (2.7.1) - builder (3.2.4) + builder (3.3.0) 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) xpath (~> 3.2) - carrierwave (2.2.5) + carrierwave (2.2.6) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) @@ -182,8 +193,8 @@ GEM cells-rails (0.1.5) actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) - charlock_holmes (0.7.7) - chef-utils (18.3.0) + charlock_holmes (0.7.9) + chef-utils (18.5.0) concurrent-ruby childprocess (4.1.0) chronic (0.10.2) @@ -197,13 +208,15 @@ GEM execjs coffee-script-source (1.12.2) commonmarker (0.23.10) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - crack (0.4.5) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.16.0) + css_parser (1.19.0) addressable + csv (3.3.0) date (3.3.4) date_validator (0.12.0) activemodel (>= 3) @@ -398,24 +411,24 @@ GEM rainbow (>= 2.1.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.9.3) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.12.0) + devise-i18n (1.12.1) devise (>= 4.9.0) 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) + docile (1.4.1) + doorkeeper (5.7.1) railties (>= 5) doorkeeper-i18n (4.0.1) dumb_delegator (1.0.0) @@ -429,11 +442,11 @@ GEM smart_properties erbse (0.1.4) temple - erubi (1.12.0) + erubi (1.13.0) escape_utils (1.3.0) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo - excon (0.109.0) + excon (0.112.0) execjs (2.9.1) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) @@ -444,38 +457,22 @@ GEM railties (>= 3.0.0) faker (2.23.0) i18n (>= 1.8.11, < 2) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - ffi (1.16.3) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-net_http (3.3.0) + net-http + ffi (1.17.0) file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-aws (3.21.0) + fog-aws (3.27.0) + base64 (~> 0.2.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - fog-core (2.4.0) + fog-core (2.5.0) builder excon (~> 0.71) formatador (>= 0.2, < 2.0) @@ -494,11 +491,13 @@ GEM activemodel (>= 4.1, < 7.1) activesupport (>= 4.1, < 7.1) railties (>= 4.1, < 7.1) - fugit (1.9.0) - et-orbi (~> 1, >= 1.2.7) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) gemoji (3.0.1) - geocoder (1.8.2) + geocoder (1.8.3) + base64 (>= 0.1.0) + csv (>= 3.0.0) globalid (1.2.1) activesupport (>= 6.1) graphql (1.12.24) @@ -510,19 +509,19 @@ GEM graphql (~> 1.12) html-pipeline (~> 2.9) sass (~> 3.4) - hashdiff (1.1.0) + hashdiff (1.1.1) hashie (5.0.0) health_check (3.1.0) railties (>= 5.0) - highline (3.0.0) - abbrev + highline (3.1.1) + reline hkdf (0.3.0) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - html_tokenizer (0.0.7) + html_tokenizer (0.0.8) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) i18n-tasks (0.9.37) activesupport (>= 4.0.2) @@ -534,18 +533,21 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.10.1) + icalendar (2.10.3) ice_cube (~> 0.16) - ice_cube (0.16.4) + ostruct + ice_cube (0.17.0) ice_nine (0.11.2) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) + io-console (0.7.2) jmespath (1.6.2) - json (2.7.1) - jwt (2.7.1) + json (2.7.2) + jwt (2.9.3) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -564,15 +566,16 @@ GEM kramdown (~> 2.0) launchy (2.5.2) addressable (~> 2.8) - letter_opener (1.8.1) - launchy (>= 2.2, < 3) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) letter_opener_web (1.4.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -581,7 +584,7 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) mdl (0.13.0) kramdown (~> 2.3) @@ -589,40 +592,36 @@ GEM mixlib-cli (~> 2.1, >= 2.1.1) mixlib-config (>= 2.2.1, < 4) mixlib-shellout - method_source (1.0.0) - mime-types (3.5.2) + method_source (1.1.0) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2023.1205) - mini_magick (4.12.0) + mime-types-data (3.2024.1001) + mini_magick (4.13.2) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.20.0) + minitest (5.25.1) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.7) + mixlib-shellout (3.2.8) chef-utils - msgpack (1.7.2) + msgpack (1.7.3) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.3.0) mustache (1.1.1) - net-imap (0.4.9.1) + net-http (0.4.1) + uri + net-imap (0.4.16) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.14.5) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - nokogiri (1.14.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.14.5-x86_64-linux) + nio4r (2.7.3) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -643,52 +642,54 @@ GEM rack-protection omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (1.1.1) - jwt (>= 2.0) - oauth2 (~> 2.0.6) + omniauth-google-oauth2 (1.2.0) + jwt (>= 2.9) + oauth2 (~> 2.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8.0) - omniauth-oauth (1.2.0) + omniauth-oauth2 (~> 1.8) + omniauth-oauth (1.2.1) oauth omniauth (>= 1.0, < 3) + rack (>= 1.6.2, < 4) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) - omniauth-rails_csrf_protection (1.0.1) + omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) + ostruct (0.6.0) paper_trail (12.3.0) activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.23.0) + parallel (1.26.3) parallel_tests (3.13.0) parallel - parser (3.2.2.4) + parser (3.3.5.0) ast (~> 2.4.1) racc pg (1.1.4) - pg_search (2.3.6) - activerecord (>= 5.2) - activesupport (>= 5.2) + pg_search (2.3.7) + activerecord (>= 6.1) + activesupport (>= 6.1) polyglot (0.3.5) - premailer (1.22.0) + premailer (1.27.0) addressable - css_parser (>= 1.12.0) + css_parser (>= 1.19.0) htmlentities (>= 4.0.0) premailer-rails (1.12.0) actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (5.0.4) - puma (5.6.7) + public_suffix (6.0.1) + puma (5.6.9) nio4r (~> 2.0) raabro (1.4.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.1) + rack (2.2.9) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (1.1.1) @@ -700,20 +701,20 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails (6.1.7.8) + actioncable (= 6.1.7.8) + actionmailbox (= 6.1.7.8) + actionmailer (= 6.1.7.8) + actionpack (= 6.1.7.8) + actiontext (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activemodel (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) bundler (>= 1.15.0) - railties (= 6.1.7.6) + railties (= 6.1.7.8) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -728,48 +729,50 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) ransack (2.4.2) activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.0) redis (4.8.1) - regexp_parser (2.8.2) + regexp_parser (2.9.2) + reline (0.5.10) + io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) + rexml (3.3.8) + 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.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.11.2) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.13.0) rspec-rails (4.1.2) actionpack (>= 4.2) activesupport (>= 4.2) @@ -780,7 +783,7 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.11.1) + rspec-support (3.13.1) rspec_junit_formatter (0.3.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.28.2) @@ -792,8 +795,8 @@ 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) - parser (>= 3.2.1.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) @@ -804,10 +807,10 @@ GEM rubocop-rspec (2.11.1) rubocop (~> 1.19) ruby-progressbar (1.13.0) - ruby-vips (2.2.0) + ruby-vips (2.2.2) ffi (~> 1.12) - ruby2_keywords (0.0.5) - rubyXL (3.4.25) + logger + rubyXL (3.4.27) nokogiri (>= 1.10.8) rubyzip (>= 1.3.0) rubyzip (2.3.2) @@ -823,24 +826,21 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) semantic_range (3.0.0) - sentry-rails (4.9.2) + sentry-rails (5.21.0) railties (>= 5.0) - sentry-ruby-core (~> 4.9.2) - sentry-ruby (4.9.2) + sentry-ruby (~> 5.21.0) + sentry-ruby (5.21.0) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - faraday (~> 1.0) - sentry-ruby-core (= 4.9.2) - sentry-ruby-core (4.9.2) - concurrent-ruby - faraday seven_zip_ruby (1.3.0) - sidekiq (6.4.2) - connection_pool (>= 2.2.2) + sidekiq (6.5.12) + connection_pool (>= 2.2.5, < 3) rack (~> 2.0) - redis (>= 4.2.0) - sidekiq-cron (1.4.0) - fugit (~> 1) - sidekiq (>= 4.2.1) + redis (>= 4.5.0, < 5) + sidekiq-cron (1.12.0) + fugit (~> 1.8) + globalid (>= 1.0.1) + sidekiq (>= 6) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) @@ -848,7 +848,7 @@ GEM simplecov-cobertura (2.1.0) rexml simplecov (~> 0.19) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) smart_properties (1.17.0) snaky_hash (2.0.1) @@ -856,36 +856,37 @@ GEM version_gem (~> 1.1, >= 1.1.1) social-share-button (1.2.4) coffee-rails - spring (2.1.1) - spring-watcher-listen (2.0.1) + spring (4.0.0) + spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) - spring (>= 1.2, < 3.0) + spring (>= 4) 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-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) ssrf_filter (1.1.2) temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.2) thread_safe (0.3.6) - tilt (2.3.0) + tilt (2.4.0) timeout (0.4.1) tomlrb (2.0.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - uglifier (4.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - unicode-display_width (1.8.0) + unicode-display_width (2.6.0) + uri (0.13.1) valid_email2 (2.3.1) activemodel (>= 3.2) mail (~> 2.5) - version_gem (1.1.3) + version_gem (1.1.4) virtus (2.0.0) axiom-types (~> 0.1) coercible (~> 1.0) @@ -905,7 +906,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.19.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -922,18 +923,16 @@ GEM websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) - wicked_pdf (2.7.0) + wicked_pdf (2.8.1) activesupport wisper (2.0.1) wisper-rspec (1.1.0) - wkhtmltopdf-binary (0.12.6.6) + wkhtmltopdf-binary (0.12.6.8) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.12) + zeitwerk (2.6.18) PLATFORMS - arm64-darwin-21 - ruby x86_64-linux DEPENDENCIES @@ -945,10 +944,12 @@ DEPENDENCIES decidim-catcomu_managers! decidim-civicrm! decidim-consultations (= 0.27.5) + decidim-core (= 0.27.5) decidim-decidim_awesome (~> 0.10.2) decidim-dev (= 0.27.5) decidim-direct_verifications! decidim-navigation_maps! + decidim-term_customizer! faker (~> 2.14) fog-aws health_check @@ -961,7 +962,7 @@ DEPENDENCIES sentry-ruby sidekiq (~> 6.0) sidekiq-cron - spring (~> 2.0) + spring (= 4.0) spring-watcher-listen (~> 2.0) uglifier (~> 4.1) web-console @@ -971,4 +972,4 @@ RUBY VERSION ruby 3.0.6p216 BUNDLED WITH - 2.4.12 + 2.2.33 diff --git a/package-lock.json b/package-lock.json index a023ec7..a0e1187 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,9 @@ "jsrender": "^1.0.9", "jsviews": "^1.0.13", "leaflet.featuregroup.subgroup": "^1.0.2", - "select2": "^4.1.0-rc.0" + "select2": "^4.1.0-rc.0", + "webpack": "^5.95.0", + "yarn": "^1.22.22" }, "devDependencies": { "@decidim/dev": "^0.27.5", @@ -3244,9 +3246,9 @@ "dev": true }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" @@ -3263,9 +3265,9 @@ "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==" + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", @@ -3283,14 +3285,14 @@ "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/wasm-gen": "1.12.1" } }, "node_modules/@webassemblyjs/ieee754": { @@ -3315,26 +3317,26 @@ "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", @@ -3342,22 +3344,22 @@ } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-api-error": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", @@ -3366,11 +3368,11 @@ } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" } }, @@ -5074,9 +5076,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -12337,9 +12339,9 @@ "peer": true }, "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -12354,33 +12356,32 @@ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "node_modules/webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "version": "5.95.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz", + "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==", + "dependencies": { + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { @@ -12576,9 +12577,9 @@ } }, "node_modules/webpack/node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "bin": { "acorn": "bin/acorn" }, @@ -12586,10 +12587,10 @@ "node": ">=0.4.0" } }, - "node_modules/webpack/node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "node_modules/webpack/node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "peerDependencies": { "acorn": "^8" } @@ -13052,6 +13053,19 @@ "node": ">=10" } }, + "node_modules/yarn": { + "version": "1.22.22", + "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz", + "integrity": "sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==", + "hasInstallScript": true, + "bin": { + "yarn": "bin/yarn.js", + "yarnpkg": "bin/yarn.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/zen-observable": { "version": "0.8.15", "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz", diff --git a/package.json b/package.json index aee29a5..2e7a350 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,9 @@ "jsrender": "^1.0.9", "jsviews": "^1.0.13", "leaflet.featuregroup.subgroup": "^1.0.2", - "select2": "^4.1.0-rc.0" + "select2": "^4.1.0-rc.0", + "webpack": "^5.95.0", + "yarn": "^1.22.22" }, "version": "0.1.0", "browserslist": [ From bf0f6e430d325bb58a658df59a2dc22010471e7b Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Wed, 9 Oct 2024 21:18:23 +0200 Subject: [PATCH 02/20] Migrations for term customizer --- ...ranslation_sets.decidim_term_customizer.rb | 10 +++++++ ...er_translations.decidim_term_customizer.rb | 19 +++++++++++++ ...zer_constraints.decidim_term_customizer.rb | 18 +++++++++++++ db/schema.rb | 27 ++++++++++++++++++- 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20241009184552_create_decidim_term_customizer_translation_sets.decidim_term_customizer.rb create mode 100644 db/migrate/20241009184553_create_decidim_term_customizer_translations.decidim_term_customizer.rb create mode 100644 db/migrate/20241009184554_create_decidim_term_customizer_constraints.decidim_term_customizer.rb diff --git a/db/migrate/20241009184552_create_decidim_term_customizer_translation_sets.decidim_term_customizer.rb b/db/migrate/20241009184552_create_decidim_term_customizer_translation_sets.decidim_term_customizer.rb new file mode 100644 index 0000000..c0fc109 --- /dev/null +++ b/db/migrate/20241009184552_create_decidim_term_customizer_translation_sets.decidim_term_customizer.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true +# This migration comes from decidim_term_customizer (originally 20190217132503) + +class CreateDecidimTermCustomizerTranslationSets < ActiveRecord::Migration[5.2] + def change + create_table :decidim_term_customizer_translation_sets do |t| + t.jsonb :name + end + end +end diff --git a/db/migrate/20241009184553_create_decidim_term_customizer_translations.decidim_term_customizer.rb b/db/migrate/20241009184553_create_decidim_term_customizer_translations.decidim_term_customizer.rb new file mode 100644 index 0000000..90bced4 --- /dev/null +++ b/db/migrate/20241009184553_create_decidim_term_customizer_translations.decidim_term_customizer.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true +# This migration comes from decidim_term_customizer (originally 20190217132654) + +class CreateDecidimTermCustomizerTranslations < ActiveRecord::Migration[5.2] + def change + create_table :decidim_term_customizer_translations do |t| + t.string :locale + t.string :key + t.text :value + + t.references( + :translation_set, + null: false, + foreign_key: { to_table: :decidim_term_customizer_translation_sets }, + index: { name: "decidim_term_customizer_translation_translation_set" } + ) + end + end +end diff --git a/db/migrate/20241009184554_create_decidim_term_customizer_constraints.decidim_term_customizer.rb b/db/migrate/20241009184554_create_decidim_term_customizer_constraints.decidim_term_customizer.rb new file mode 100644 index 0000000..c027259 --- /dev/null +++ b/db/migrate/20241009184554_create_decidim_term_customizer_constraints.decidim_term_customizer.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true +# This migration comes from decidim_term_customizer (originally 20190217132726) + +class CreateDecidimTermCustomizerConstraints < ActiveRecord::Migration[5.2] + def change + create_table :decidim_term_customizer_constraints do |t| + t.references :decidim_organization, null: false, foreign_key: true, index: { name: "decidim_term_customizer_constraint_organization" } + t.references :subject, polymorphic: true, index: { name: "decidim_term_customizer_constraint_subject" } + + t.references( + :translation_set, + null: false, + foreign_key: { to_table: :decidim_term_customizer_translation_sets }, + index: { name: "decidim_term_customizer_constraint_translation_set" } + ) + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 9921576..94afafd 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: 2024_01_11_100756) do +ActiveRecord::Schema.define(version: 2024_10_09_184554) do # These are extensions that must be enabled in order to support this database enable_extension "ltree" @@ -1743,6 +1743,28 @@ t.index ["templatable_type", "templatable_id"], name: "index_decidim_templates_templatable" end + create_table "decidim_term_customizer_constraints", force: :cascade do |t| + t.bigint "decidim_organization_id", null: false + t.string "subject_type" + t.bigint "subject_id" + t.bigint "translation_set_id", null: false + t.index ["decidim_organization_id"], name: "decidim_term_customizer_constraint_organization" + t.index ["subject_type", "subject_id"], name: "decidim_term_customizer_constraint_subject" + t.index ["translation_set_id"], name: "decidim_term_customizer_constraint_translation_set" + end + + create_table "decidim_term_customizer_translation_sets", force: :cascade do |t| + t.jsonb "name" + end + + create_table "decidim_term_customizer_translations", force: :cascade do |t| + t.string "locale" + t.string "key" + t.text "value" + t.bigint "translation_set_id", null: false + t.index ["translation_set_id"], name: "decidim_term_customizer_translation_translation_set" + end + create_table "decidim_user_blocks", force: :cascade do |t| t.bigint "decidim_user_id" t.integer "blocking_user_id" @@ -2013,6 +2035,9 @@ add_foreign_key "decidim_scopes", "decidim_scope_types", column: "scope_type_id" add_foreign_key "decidim_scopes", "decidim_scopes", column: "parent_id" add_foreign_key "decidim_static_pages", "decidim_organizations" + add_foreign_key "decidim_term_customizer_constraints", "decidim_organizations" + add_foreign_key "decidim_term_customizer_constraints", "decidim_term_customizer_translation_sets", column: "translation_set_id" + add_foreign_key "decidim_term_customizer_translations", "decidim_term_customizer_translation_sets", column: "translation_set_id" add_foreign_key "decidim_user_blocks", "decidim_users" add_foreign_key "decidim_user_blocks", "decidim_users", column: "blocking_user_id" add_foreign_key "decidim_user_moderations", "decidim_users" From 24acb2c343fcd46c8cf3b4dd748d2c5c5984679b Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 07:56:50 +0200 Subject: [PATCH 03/20] Don't specify chromedriver version in test to match chrome version --- .github/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7a56a36..80d4850 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,8 +37,6 @@ jobs: bundler-cache: true - uses: nanasess/setup-chromedriver@v2 - with: - chromedriver-version: 119.0.6045.105 - name: Setup & create Database run: | From a25d9a011a5c9f9f94d83c696066f151f95b7842 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 08:07:03 +0200 Subject: [PATCH 04/20] Chromedriver -v 129 --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80d4850..0dd4f22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,6 +37,8 @@ jobs: bundler-cache: true - uses: nanasess/setup-chromedriver@v2 + with: + chromedriver-version: 129.0.6668.71 - name: Setup & create Database run: | From 5b4b4fba03d5886a785334a6066977cd62155455 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 08:29:46 +0200 Subject: [PATCH 05/20] test in ubuntu-latest --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dd4f22..5bab2fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ env: jobs: test: name: Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest services: postgres: image: postgres:11 From 037373a928b3435faf8ee5fcbf279fb3bf12342a Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 10:57:03 +0200 Subject: [PATCH 06/20] Fix for decidim issue #13513 and correct rubocop-ast in test environment --- .github/workflows/test.yml | 4 ++-- Gemfile | 1 + Gemfile.lock | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5bab2fb..da27794 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ env: jobs: test: name: Test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 services: postgres: image: postgres:11 @@ -38,7 +38,7 @@ jobs: - uses: nanasess/setup-chromedriver@v2 with: - chromedriver-version: 129.0.6668.71 + chromedriver-version: 119.0.6045.105 - name: Setup & create Database run: | diff --git a/Gemfile b/Gemfile index 1437011..e56bdb6 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,7 @@ group :development, :test do gem "rubocop-faker" gem "decidim-dev", DECIDIM_VERSION + gem "rubocop-ast", "~> 1.31", ">= 1.31.2" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 995a0b6..a4d77c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -957,6 +957,7 @@ DEPENDENCIES listen (~> 3.1) puma (>= 5.0.0) rspec + rubocop-ast (~> 1.31, >= 1.31.2) rubocop-faker sentry-rails sentry-ruby From 65773dce07f33de1dca5031bffb14230a2ef0c07 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 11:14:22 +0200 Subject: [PATCH 07/20] Set chromedriver to v129 in test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da27794..82b31ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: - uses: nanasess/setup-chromedriver@v2 with: - chromedriver-version: 119.0.6045.105 + chromedriver-version: 129.0.6668.71 - name: Setup & create Database run: | From 543153111ae8b6fba6d18e84f0589f03e1d0e4ba Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 11:28:20 +0200 Subject: [PATCH 08/20] set rubocop-ast to 1.31.2 --- .github/workflows/test.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82b31ab..5bab2fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ env: jobs: test: name: Test - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest services: postgres: image: postgres:11 diff --git a/Gemfile b/Gemfile index e56bdb6..cedbfed 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ group :development, :test do gem "rubocop-faker" gem "decidim-dev", DECIDIM_VERSION - gem "rubocop-ast", "~> 1.31", ">= 1.31.2" + gem "rubocop-ast", "1.31.2" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index a4d77c8..4adb14e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -795,8 +795,8 @@ GEM rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.32.3) - parser (>= 3.3.1.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) @@ -957,7 +957,7 @@ DEPENDENCIES listen (~> 3.1) puma (>= 5.0.0) rspec - rubocop-ast (~> 1.31, >= 1.31.2) + rubocop-ast (= 1.31.2) rubocop-faker sentry-rails sentry-ruby From eb8161039dce7e8236586af171a509e0046d5b65 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 11:44:39 +0200 Subject: [PATCH 09/20] test in ubuntu-22.04 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5bab2fb..82b31ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ env: jobs: test: name: Test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 services: postgres: image: postgres:11 From 857413b33bf3e157fd0cbe2359ac016113f3111f Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 13:12:57 +0200 Subject: [PATCH 10/20] config force_ssl=true in test environment --- config/environments/test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/environments/test.rb b/config/environments/test.rb index 5169dda..7972c41 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -43,6 +43,8 @@ # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr + config.force_ssl = true + # Raises error for missing translations # config.action_view.raise_on_missing_translations = true end From ba6d41b63e4f001a57c697f0db1ce1d64706ff20 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 13:21:18 +0200 Subject: [PATCH 11/20] config.force_ssl = false in test env --- config/environments/test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 7972c41..d448818 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -43,7 +43,7 @@ # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr - config.force_ssl = true + config.force_ssl = false # Raises error for missing translations # config.action_view.raise_on_missing_translations = true From a4512aefb0ba083ebe9f0d80b57d2fcafa58266a Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 13:33:27 +0200 Subject: [PATCH 12/20] Try ubuntu-20.04 in test.yml --- .github/workflows/test.yml | 2 +- config/environments/test.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82b31ab..0dd4f22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ env: jobs: test: name: Test - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 services: postgres: image: postgres:11 diff --git a/config/environments/test.rb b/config/environments/test.rb index d448818..5169dda 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -43,8 +43,6 @@ # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr - config.force_ssl = false - # Raises error for missing translations # config.action_view.raise_on_missing_translations = true end From 73056f988ac8231ec0e3cf8ba5904855d12ce1e7 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Thu, 10 Oct 2024 13:42:20 +0200 Subject: [PATCH 13/20] force chrome and chrome driver to v119 --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dd4f22..454f0a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,6 +27,9 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: + - name: Set Chrome Version + run: echo "CHROME_VERSION=119.0.6045.105" >> $GITHUB_ENV + - uses: actions/checkout@v2 with: fetch-depth: 1 @@ -38,7 +41,8 @@ jobs: - uses: nanasess/setup-chromedriver@v2 with: - chromedriver-version: 129.0.6668.71 + chromedriver-version: 119.0.6045.105 + - name: Setup & create Database run: | From c5b2179835a1cfc3824691ba0e126cced37cbf21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Thu, 10 Oct 2024 16:15:59 +0200 Subject: [PATCH 14/20] force parser version --- Gemfile | 4 ++-- Gemfile.lock | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cedbfed..2d1abe0 100644 --- a/Gemfile +++ b/Gemfile @@ -30,10 +30,10 @@ gem "rspec" group :development, :test do gem "byebug", "~> 11.0", platform: :mri - gem "rubocop-faker" - gem "decidim-dev", DECIDIM_VERSION + gem "parser", "3.3.0.4" gem "rubocop-ast", "1.31.2" + gem "rubocop-faker" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 4adb14e..2c0afb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -668,7 +668,7 @@ GEM parallel (1.26.3) parallel_tests (3.13.0) parallel - parser (3.3.5.0) + parser (3.3.0.4) ast (~> 2.4.1) racc pg (1.1.4) @@ -955,6 +955,7 @@ DEPENDENCIES health_check letter_opener_web (~> 1.3) listen (~> 3.1) + parser (= 3.3.0.4) puma (>= 5.0.0) rspec rubocop-ast (= 1.31.2) From 80c5622050910eebcb41319ce7ee54612425163b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Thu, 10 Oct 2024 16:20:59 +0200 Subject: [PATCH 15/20] update workflow test chromedriver version --- .github/workflows/test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 454f0a9..6f42e4b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,9 +27,6 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - name: Set Chrome Version - run: echo "CHROME_VERSION=119.0.6045.105" >> $GITHUB_ENV - - uses: actions/checkout@v2 with: fetch-depth: 1 @@ -41,8 +38,7 @@ jobs: - uses: nanasess/setup-chromedriver@v2 with: - chromedriver-version: 119.0.6045.105 - + chromedriver-version: 129.0.6668.89 - name: Setup & create Database run: | From 4d86fc052408074a98b7ee2fb7b432afc375d69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Fri, 11 Oct 2024 11:29:05 +0200 Subject: [PATCH 16/20] update ubuntu version and downgrade chrome version --- .github/workflows/test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f42e4b..3f160d8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,11 +12,12 @@ env: RAILS_ENV: test DATABASE_USERNAME: postgres DATABASE_PASSWORD: postgres + CHROME_VERSION: 119.0.6045.105 jobs: test: name: Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 services: postgres: image: postgres:11 @@ -36,9 +37,13 @@ jobs: ruby-version: ${{ env.RUBY_VERSION }} bundler-cache: true + - uses: browser-actions/setup-chrome@v1 + with: + chrome-version: ${{ env.CHROME_VERSION }} + - uses: nanasess/setup-chromedriver@v2 with: - chromedriver-version: 129.0.6668.89 + chromedriver-version: ${{ env.CHROME_VERSION }} - name: Setup & create Database run: | From 6b7bf9f88ebcd25103b472e764fdbd04dbb7cf89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Fri, 11 Oct 2024 12:30:00 +0200 Subject: [PATCH 17/20] remove default chrome install in ubuntu --- .github/workflows/test.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f160d8..f2b76fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,14 +37,22 @@ jobs: ruby-version: ${{ env.RUBY_VERSION }} bundler-cache: true - - uses: browser-actions/setup-chrome@v1 - with: - chrome-version: ${{ env.CHROME_VERSION }} - - uses: nanasess/setup-chromedriver@v2 with: chromedriver-version: ${{ env.CHROME_VERSION }} + - name: List Chrome + shell: "bash" + run: apt list --installed | grep chrome + + - name: Remove Chrome + shell: "bash" + run: sudo apt remove google-chrome-stable + + - uses: browser-actions/setup-chrome@v1 + with: + chrome-version: ${{ env.CHROME_VERSION }} + - name: Setup & create Database run: | bundle exec rails db:create db:schema:load From 21425e02655837e445126d8f489c480d9f9929dc Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Tue, 15 Oct 2024 11:31:31 +0200 Subject: [PATCH 18/20] Remove decidim-core and spring versioning from Gemfile --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2d1abe0..95c7816 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,6 @@ gem "decidim-catcomu_managers", path: "./decidim-module-catcomu_managers" gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing", branch: "release/0.27-stable" gem "decidim-civicrm", git: "https://github.com/Platoniq/decidim-module-civicrm" -gem "decidim-core", DECIDIM_VERSION gem "decidim-decidim_awesome", "~> 0.10.2" gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications" gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps", branch: "release/0.27-stable" @@ -39,7 +38,7 @@ end group :development do gem "letter_opener_web", "~> 1.3" gem "listen", "~> 3.1" - gem "spring", "4.0" + gem "spring" gem "spring-watcher-listen", "~> 2.0" gem "web-console" end From 3f6d582a2c54710fe8e1e4a05e1e7f4ed9d0cbc0 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Tue, 15 Oct 2024 11:32:14 +0200 Subject: [PATCH 19/20] Bundle with new Gemfile --- Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2c0afb7..65ffc8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -944,7 +944,6 @@ DEPENDENCIES decidim-catcomu_managers! decidim-civicrm! decidim-consultations (= 0.27.5) - decidim-core (= 0.27.5) decidim-decidim_awesome (~> 0.10.2) decidim-dev (= 0.27.5) decidim-direct_verifications! @@ -964,7 +963,7 @@ DEPENDENCIES sentry-ruby sidekiq (~> 6.0) sidekiq-cron - spring (= 4.0) + spring spring-watcher-listen (~> 2.0) uglifier (~> 4.1) web-console From 5966f85d25c593087724436ce8cf03acfe53594f Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Tue, 15 Oct 2024 15:26:52 +0200 Subject: [PATCH 20/20] Remove parser and rubocop-ast from Gemfile --- Gemfile | 2 -- Gemfile.lock | 2 -- 2 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 95c7816..2f5aec7 100644 --- a/Gemfile +++ b/Gemfile @@ -30,8 +30,6 @@ gem "rspec" group :development, :test do gem "byebug", "~> 11.0", platform: :mri gem "decidim-dev", DECIDIM_VERSION - gem "parser", "3.3.0.4" - gem "rubocop-ast", "1.31.2" gem "rubocop-faker" end diff --git a/Gemfile.lock b/Gemfile.lock index 65ffc8c..4694327 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -954,10 +954,8 @@ DEPENDENCIES health_check letter_opener_web (~> 1.3) listen (~> 3.1) - parser (= 3.3.0.4) puma (>= 5.0.0) rspec - rubocop-ast (= 1.31.2) rubocop-faker sentry-rails sentry-ruby