From 3721526d302632da4eaad73efbb6cd6c6402c2ed Mon Sep 17 00:00:00 2001 From: takahashim Date: Mon, 11 Mar 2024 19:55:07 +0900 Subject: [PATCH 1/7] Update decidim v0.27.5 --- Gemfile | 6 +- Gemfile.lock | 415 ++++++++++++++++++++++++++------------------------- 2 files changed, 214 insertions(+), 207 deletions(-) diff --git a/Gemfile b/Gemfile index 8f4d343df..679a4561b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,14 +4,14 @@ source "https://rubygems.org" ruby RUBY_VERSION -gem "decidim", "0.27.4" +gem "decidim", "0.27.5" gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-module-decidim_awesome.git", branch: "v0.9.3-2023-08-31" gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "027-ja" gem "decidim-navigation_maps", git: "https://github.com/codeforjapan/decidim-module-navigation_maps.git", branch: "v1.3.4-2024-01-28" -gem "decidim-polis", git: "https://github.com/codeforjapan/decidim-polis.git", branch: "update-0-27-4" +gem "decidim-polis", git: "https://github.com/takahashim/decidim-polis.git", branch: "update-0-27-5" gem "bootsnap" @@ -39,7 +39,7 @@ group :development, :test do gem "byebug", "~> 11.0", platform: :mri gem "figaro" - gem "decidim-dev", "0.27.4" + gem "decidim-dev", "0.27.5" gem "dotenv-rails" gem "factory_bot_rails" gem "rspec-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 83333c688..fa6c51709 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GIT decidim-core (~> 0.27.0) GIT - remote: https://github.com/codeforjapan/decidim-polis.git - revision: 381361dca6919d71fb76c2d0244afb78a2c3bd7d - branch: update-0-27-4 + remote: https://github.com/takahashim/decidim-polis.git + revision: b55273473b0d958a3d318c1bba5e84f938d124f1 + branch: update-0-27-5 specs: - decidim-polis (0.27.4) - decidim-core (= 0.27.4) + decidim-polis (0.27.5) + decidim-core (= 0.27.5) PATH remote: decidim-user_extension @@ -51,40 +51,40 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.4) - actionpack (= 6.1.7.4) - activesupport (= 6.1.7.4) + actioncable (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.4) - actionpack (= 6.1.7.4) - activejob (= 6.1.7.4) - activerecord (= 6.1.7.4) - activestorage (= 6.1.7.4) - activesupport (= 6.1.7.4) + actionmailbox (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (>= 2.7.1) - actionmailer (6.1.7.4) - actionpack (= 6.1.7.4) - actionview (= 6.1.7.4) - activejob (= 6.1.7.4) - activesupport (= 6.1.7.4) + actionmailer (6.1.7.7) + actionpack (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.4) - actionview (= 6.1.7.4) - activesupport (= 6.1.7.4) + actionpack (6.1.7.7) + actionview (= 6.1.7.7) + activesupport (= 6.1.7.7) 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.4) - actionpack (= 6.1.7.4) - activerecord (= 6.1.7.4) - activestorage (= 6.1.7.4) - activesupport (= 6.1.7.4) + actiontext (6.1.7.7) + actionpack (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) nokogiri (>= 1.8.5) - actionview (6.1.7.4) - activesupport (= 6.1.7.4) + actionview (6.1.7.7) + activesupport (= 6.1.7.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -92,22 +92,22 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (6.1.7.4) - activesupport (= 6.1.7.4) + activejob (6.1.7.7) + activesupport (= 6.1.7.7) globalid (>= 0.3.6) - activemodel (6.1.7.4) - activesupport (= 6.1.7.4) - activerecord (6.1.7.4) - activemodel (= 6.1.7.4) - activesupport (= 6.1.7.4) - activestorage (6.1.7.4) - actionpack (= 6.1.7.4) - activejob (= 6.1.7.4) - activerecord (= 6.1.7.4) - activesupport (= 6.1.7.4) + activemodel (6.1.7.7) + activesupport (= 6.1.7.7) + activerecord (6.1.7.7) + activemodel (= 6.1.7.7) + activesupport (= 6.1.7.7) + activestorage (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activesupport (= 6.1.7.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.4) + activesupport (6.1.7.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -115,7 +115,7 @@ GEM zeitwerk (~> 2.3) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.2.0) @@ -134,7 +134,7 @@ GEM aws-sigv4 (~> 1.6) aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.7.0) + axe-core-api (4.8.2) dumb_delegator virtus axe-core-rspec (4.1.0) @@ -145,8 +145,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.19) + bcrypt (3.1.20) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) @@ -155,22 +156,23 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties + bigdecimal (3.1.6) bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) browser (2.7.1) builder (3.2.4) byebug (11.1.3) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.4) + carrierwave (2.2.5) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) @@ -190,7 +192,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.4.2) concurrent-ruby childprocess (4.1.0) coercible (1.0.0) @@ -203,67 +205,68 @@ GEM execjs coffee-script-source (1.12.2) commonmarker (0.23.10) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) - crack (0.4.5) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.14.0) + css_parser (1.16.0) addressable - date (3.3.3) + date (3.3.4) date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) db-query-matchers (0.10.0) activesupport (>= 4.0, < 7) rspec (~> 3.0) - decidim (0.27.4) - decidim-accountability (= 0.27.4) - decidim-admin (= 0.27.4) - decidim-api (= 0.27.4) - decidim-assemblies (= 0.27.4) - decidim-blogs (= 0.27.4) - decidim-budgets (= 0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-debates (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-generators (= 0.27.4) - decidim-meetings (= 0.27.4) - decidim-pages (= 0.27.4) - decidim-participatory_processes (= 0.27.4) - decidim-proposals (= 0.27.4) - decidim-sortitions (= 0.27.4) - decidim-surveys (= 0.27.4) - decidim-system (= 0.27.4) - decidim-templates (= 0.27.4) - decidim-verifications (= 0.27.4) - decidim-accountability (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-admin (0.27.4) + decidim (0.27.5) + decidim-accountability (= 0.27.5) + decidim-admin (= 0.27.5) + decidim-api (= 0.27.5) + decidim-assemblies (= 0.27.5) + decidim-blogs (= 0.27.5) + decidim-budgets (= 0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) + decidim-debates (= 0.27.5) + decidim-forms (= 0.27.5) + decidim-generators (= 0.27.5) + decidim-meetings (= 0.27.5) + decidim-pages (= 0.27.5) + decidim-participatory_processes (= 0.27.5) + decidim-proposals (= 0.27.5) + decidim-sortitions (= 0.27.5) + decidim-surveys (= 0.27.5) + decidim-system (= 0.27.5) + decidim-templates (= 0.27.5) + decidim-verifications (= 0.27.5) + decidim-accountability (0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) + decidim-admin (0.27.5) active_link_to (~> 1.0) - decidim-core (= 0.27.4) + decidim-core (= 0.27.5) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-api (0.27.4) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-api (0.27.5) graphql (~> 1.12, < 1.13) graphql-docs (~> 2.1.0) rack-cors (~> 1.0) - decidim-assemblies (0.27.4) - decidim-core (= 0.27.4) - decidim-blogs (0.27.4) - decidim-admin (= 0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-budgets (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-comments (0.27.4) - decidim-core (= 0.27.4) + decidim-assemblies (0.27.5) + decidim-core (= 0.27.5) + decidim-blogs (0.27.5) + decidim-admin (= 0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) + decidim-budgets (0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) + decidim-comments (0.27.5) + decidim-core (= 0.27.5) redcarpet (~> 3.5, >= 3.5.1) - decidim-core (0.27.4) + decidim-core (0.27.5) active_link_to (~> 1.0) acts_as_list (~> 0.9) batch-loader (~> 1.2) @@ -273,7 +276,7 @@ GEM cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) date_validator (~> 0.12.0) - decidim-api (= 0.27.4) + decidim-api (= 0.27.5) devise (~> 4.7) devise-i18n (~> 1.2) diffy (~> 3.3) @@ -314,15 +317,15 @@ GEM webpacker (= 6.0.0.rc.5) webpush (~> 1.1) wisper (~> 2.0) - decidim-debates (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-dev (0.27.4) + decidim-debates (0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) + decidim-dev (0.27.5) axe-core-rspec (~> 4.1.0) byebug (~> 11.0) capybara (~> 3.24) db-query-matchers (~> 0.10.0) - decidim (= 0.27.4) + decidim (= 0.27.5) erb_lint (~> 0.0.35) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) @@ -345,45 +348,45 @@ GEM w3c_rspec_validators (~> 0.3.0) webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.27.4) - decidim-core (= 0.27.4) + decidim-forms (0.27.5) + decidim-core (= 0.27.5) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.27.4) - decidim-core (= 0.27.4) - decidim-meetings (0.27.4) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) + decidim-generators (0.27.5) + decidim-core (= 0.27.5) + decidim-meetings (0.27.5) + decidim-core (= 0.27.5) + decidim-forms (= 0.27.5) icalendar (~> 2.5) - decidim-pages (0.27.4) - decidim-core (= 0.27.4) - decidim-participatory_processes (0.27.4) - decidim-core (= 0.27.4) - decidim-proposals (0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) + decidim-pages (0.27.5) + decidim-core (= 0.27.5) + decidim-participatory_processes (0.27.5) + decidim-core (= 0.27.5) + decidim-proposals (0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) doc2text (~> 0.4.5) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.27.4) - decidim-admin (= 0.27.4) - decidim-comments (= 0.27.4) - decidim-core (= 0.27.4) - decidim-proposals (= 0.27.4) - decidim-surveys (0.27.4) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-templates (= 0.27.4) - decidim-system (0.27.4) + decidim-sortitions (0.27.5) + decidim-admin (= 0.27.5) + decidim-comments (= 0.27.5) + decidim-core (= 0.27.5) + decidim-proposals (= 0.27.5) + decidim-surveys (0.27.5) + decidim-core (= 0.27.5) + decidim-forms (= 0.27.5) + decidim-templates (= 0.27.5) + decidim-system (0.27.5) active_link_to (~> 1.0) - decidim-core (= 0.27.4) + decidim-core (= 0.27.5) devise (~> 4.7) devise-i18n (~> 1.2) - devise_invitable (~> 2.0) - decidim-templates (0.27.4) - decidim-core (= 0.27.4) - decidim-forms (= 0.27.4) - decidim-verifications (0.27.4) - decidim-core (= 0.27.4) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-templates (0.27.5) + decidim-core (= 0.27.5) + decidim-forms (= 0.27.5) + decidim-verifications (0.27.5) + decidim-core (= 0.27.5) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -395,24 +398,24 @@ 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) 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.6) + doorkeeper (5.6.9) railties (>= 5) doorkeeper-i18n (4.0.1) dotenv (2.8.1) @@ -432,8 +435,8 @@ GEM temple erubi (1.12.0) escape_utils (1.3.0) - excon (0.100.0) - execjs (2.8.1) + excon (0.109.0) + execjs (2.9.1) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) factory_bot (4.11.1) @@ -443,16 +446,16 @@ GEM railties (>= 3.0.0) faker (3.2.0) i18n (>= 1.8.11, < 2) - faraday (2.7.10) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) faraday-mashify (0.1.1) faraday (~> 2.0) hashie faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.0.2) - ffi (1.15.5) + faraday-net_http (3.1.0) + net-http + ffi (1.16.3) figaro (1.2.0) thor (>= 0.14.0, < 2) file_validators (3.0.0) @@ -462,7 +465,7 @@ GEM fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - fog-core (2.3.0) + fog-core (2.4.0) builder excon (~> 0.71) formatador (>= 0.2, < 2.0) @@ -486,8 +489,8 @@ GEM get_process_mem (0.2.7) ffi (~> 1.0) gli (2.21.0) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) graphql (1.12.24) graphql-docs (2.1.0) commonmarker (~> 0.16) @@ -497,16 +500,16 @@ GEM graphql (~> 1.12) html-pipeline (~> 2.9) sass (~> 3.4) - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) - highline (2.1.0) + highline (3.0.1) hkdf (0.3.0) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) html_tokenizer (0.0.7) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) i18n-tasks (0.9.37) activesupport (>= 4.0.2) @@ -518,7 +521,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) @@ -528,8 +531,9 @@ GEM invisible_captcha (0.13.0) rails (>= 3.2.0) jmespath (1.6.2) - json (2.6.3) - jwt (2.7.1) + json (2.7.1) + jwt (2.8.1) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -566,22 +570,22 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) 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.5.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) + mime-types-data (3.2024.0305) mini_magick (4.12.0) - mini_mime (1.1.2) - mini_portile2 (2.8.4) - minitest (5.19.0) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + minitest (5.22.2) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb @@ -592,19 +596,21 @@ GEM multi_xml (0.6.0) multipart-post (2.3.0) mustache (1.1.1) - net-imap (0.3.7) + net-http (0.4.1) + uri + net-imap (0.4.10) 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.1) net-protocol newrelic_rpm (9.3.1) - nio4r (2.5.9) - nokogiri (1.14.5) - mini_portile2 (~> 2.8.0) + nio4r (2.7.0) + nokogiri (1.16.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -619,7 +625,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 @@ -657,7 +663,7 @@ GEM activerecord (>= 5.2) activesupport (>= 5.2) polyglot (0.3.5) - premailer (1.21.0) + premailer (1.23.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) @@ -665,38 +671,39 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (5.0.3) + public_suffix (5.0.4) puma (5.6.6) nio4r (~> 2.0) puma_worker_killer (0.3.1) get_process_mem (~> 0.2) puma (>= 2.7) - racc (1.7.1) - rack (2.2.8) + racc (1.7.3) + rack (2.2.8.1) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-protection (3.1.0) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) - rack-proxy (0.7.6) + rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.4) - actioncable (= 6.1.7.4) - actionmailbox (= 6.1.7.4) - actionmailer (= 6.1.7.4) - actionpack (= 6.1.7.4) - actiontext (= 6.1.7.4) - actionview (= 6.1.7.4) - activejob (= 6.1.7.4) - activemodel (= 6.1.7.4) - activerecord (= 6.1.7.4) - activestorage (= 6.1.7.4) - activesupport (= 6.1.7.4) + rails (6.1.7.7) + actioncable (= 6.1.7.7) + actionmailbox (= 6.1.7.7) + actionmailer (= 6.1.7.7) + actionpack (= 6.1.7.7) + actiontext (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activemodel (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) bundler (>= 1.15.0) - railties (= 6.1.7.4) + railties (= 6.1.7.7) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -711,14 +718,14 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.7.4) - actionpack (= 6.1.7.4) - activesupport (= 6.1.7.4) + railties (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) method_source 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) @@ -731,7 +738,7 @@ GEM regexp_parser (2.8.1) 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) @@ -739,9 +746,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) @@ -787,9 +794,8 @@ GEM rubocop-rspec (2.11.1) rubocop (~> 1.19) ruby-progressbar (1.13.0) - ruby-vips (2.1.4) + ruby-vips (2.2.1) ffi (~> 1.12) - ruby2_keywords (0.0.5) rubyXL (3.4.25) nokogiri (>= 1.10.8) rubyzip (>= 1.3.0) @@ -836,21 +842,21 @@ 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) - temple (0.10.2) + ssrf_filter (1.1.2) + temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.1) thread_safe (0.3.6) - tilt (2.2.0) - timeout (0.4.0) + tilt (2.3.0) + timeout (0.4.1) tomlrb (2.0.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -858,6 +864,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (2.4.2) + uri (0.13.0) valid_email2 (2.3.1) activemodel (>= 3.2) mail (~> 2.5) @@ -881,7 +888,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.18.1) + webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -903,7 +910,7 @@ GEM wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.11) + zeitwerk (2.6.13) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -914,9 +921,9 @@ DEPENDENCIES aws-sdk-s3 bootsnap byebug (~> 11.0) - decidim (= 0.27.4) + decidim (= 0.27.5) decidim-decidim_awesome! - decidim-dev (= 0.27.4) + decidim-dev (= 0.27.5) decidim-navigation_maps! decidim-polis! decidim-term_customizer! From d3911c8e51cefbac9388be94042a28cfbceaccc3 Mon Sep 17 00:00:00 2001 From: ayuki_j <19406594+ayuki-joto@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:53:24 +0900 Subject: [PATCH 2/7] feat: update decidim-polis --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 679a4561b..1890a3756 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-mod gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "027-ja" gem "decidim-navigation_maps", git: "https://github.com/codeforjapan/decidim-module-navigation_maps.git", branch: "v1.3.4-2024-01-28" -gem "decidim-polis", git: "https://github.com/takahashim/decidim-polis.git", branch: "update-0-27-5" +gem "decidim-polis", git: "https://github.com/codeforjapan/decidim-polis.git", branch: "update-0-27-5" gem "bootsnap" From b1310055bb8fca478d7f85e3bde4557310d92ab2 Mon Sep 17 00:00:00 2001 From: ayuki_j <19406594+ayuki-joto@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:11:25 +0900 Subject: [PATCH 3/7] fix: refactor update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fa6c51709..abd33be8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GIT decidim-core (~> 0.27.0) GIT - remote: https://github.com/takahashim/decidim-polis.git + remote: https://github.com/codeforjapan/decidim-polis.git revision: b55273473b0d958a3d318c1bba5e84f938d124f1 branch: update-0-27-5 specs: From 353a726637e80ca4feaa55dffb7df7768e98e3c5 Mon Sep 17 00:00:00 2001 From: takahashim Date: Mon, 18 Mar 2024 19:25:29 +0900 Subject: [PATCH 4/7] remove Capybara settings in rails_helper.rb --- spec/rails_helper.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 8b1addc74..b0f50729f 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -32,23 +32,6 @@ exit 1 end -Capybara.register_driver :headless_chrome do |app| - options = Selenium::WebDriver::Chrome::Options.new - options.args << "--headless=new" - options.args << "--no-sandbox" - options.args << if ENV["BIG_SCREEN_SIZE"].present? - "--window-size=1920,3000" - else - "--window-size=1920,1080" - end - options.args << "--ignore-certificate-errors" if ENV["TEST_SSL"] - Capybara::Selenium::Driver.new( - app, - browser: :chrome, - capabilities: [options] - ) -end - RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures # config.fixture_path = "#{::Rails.root}/spec/fixtures" From 8d6c7540b447ee49ead23f8173e7156f69a7659b Mon Sep 17 00:00:00 2001 From: takahashim Date: Tue, 19 Mar 2024 00:55:48 +0900 Subject: [PATCH 5/7] copy user_profile_spec.rb from v0.28.0 --- spec/system/user_profile_spec.rb | 120 +++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 37 deletions(-) diff --git a/spec/system/user_profile_spec.rb b/spec/system/user_profile_spec.rb index 90962b5e7..08b3e2119 100644 --- a/spec/system/user_profile_spec.rb +++ b/spec/system/user_profile_spec.rb @@ -6,13 +6,13 @@ let(:user) { create(:user, :confirmed) } before do - I18n.default_locale = :en + Rails.application.config.i18n.default_locale = :en Decidim.default_locale = :en switch_to_host(user.organization.host) end after do - I18n.default_locale = :ja + Rails.application.config.i18n.default_locale = :ja Decidim.default_locale = :ja end @@ -27,14 +27,18 @@ end end + it "is not indexable by crawlers" do + expect(page.find('meta[name="robots"]', visible: false)[:content]).to eq("noindex") + end + it "shows the profile page when clicking on the menu" do - within ".wrapper" do + within "[data-content]" do expect(page).to have_content(user.nickname) end end it "adds a link to edit the profile" do - within ".wrapper" do + within "[data-content]" do click_link "Edit profile" end @@ -47,10 +51,14 @@ visit decidim.profile_path(user.nickname) end + it "is not indexable by crawlers" do + expect(page.find('meta[name="robots"]', visible: false)[:content]).to eq("noindex") + end + it "shows user name in the header, its nickname and a contact link" do - expect(page).to have_css("h1", text: user.name) + expect(page).to have_selector("h1", text: user.name) expect(page).to have_content(user.nickname) - expect(page).to have_link("Contact") + expect(page).to have_link("Message") end it "does not show officialization stuff" do @@ -61,7 +69,7 @@ let(:user) { create(:user, :officialized, officialized_as: nil) } it "shows officialization status" do - expect(page).to have_content("This participant is publicly verified") + expect(page).to have_content("Official participant") end end @@ -71,26 +79,36 @@ end it "shows officialization status" do + click_link "Badges" expect(page).to have_content("Major of Barcelona") end + + it "is not indexable by crawlers" do + click_link "Badges" + expect(page.find('meta[name="robots"]', visible: false)[:content]).to eq("noindex") + end end context "when displaying followers and following" do let(:other_user) { create(:user, organization: user.organization) } let(:user_to_follow) { create(:user, organization: user.organization) } + let(:user_group) { create(:user_group, organization: user.organization) } let(:public_resource) { create(:dummy_resource, :published) } before do - create(:follow, user: user, followable: other_user) - create(:follow, user: user, followable: user_to_follow) + create(:follow, user:, followable: other_user) + create(:follow, user:, followable: user_to_follow) create(:follow, user: other_user, followable: user) - create(:follow, user: user, followable: public_resource) + create(:follow, user:, followable: user_group) + create(:follow, user:, followable: public_resource) end it "shows the number of followers and following" do visit decidim.profile_path(user.nickname) - expect(page).to have_link("Followers 1") - expect(page).to have_link("Follows 3") + within(".profile__details") do + expect(page).to have_content("1 follower") + expect(page).to have_content("3 follows") + end end it "lists the followers" do @@ -98,6 +116,7 @@ click_link "Followers" expect(page).to have_content(other_user.name) + expect(page.find('meta[name="robots"]', visible: false)[:content]).to eq("noindex") end it "lists the followings" do @@ -107,26 +126,66 @@ expect(page).to have_no_content("Some of the resources followed are not public.") expect(page).to have_content(translated(other_user.name)) expect(page).to have_content(translated(user_to_follow.name)) - expect(page).to have_content(translated(public_resource.title)) + expect(page).to have_content(translated(user_group.name)) + expect(page).to have_no_content(translated(public_resource.title)) + expect(page.find('meta[name="robots"]', visible: false)[:content]).to eq("noindex") end context "when the user follows non public resources" do - let(:non_public_resource) { create(:dummy_resource) } + let(:non_public_resource) { create(:user, :blocked) } before do - create(:follow, user: user, followable: non_public_resource) + create(:follow, user:, followable: non_public_resource) end it "lists only the public followings" do visit decidim.profile_path(user.nickname) - expect(page).to have_link("Follows 4") + within(".profile__details") do + expect(page).to have_content("4 follows") + end click_link "Follows" expect(page).to have_content("Some of the resources followed are not public.") expect(page).to have_content(translated(other_user.name)) expect(page).to have_content(translated(user_to_follow.name)) - expect(page).to have_content(translated(public_resource.title)) - expect(page).to have_no_content(translated(non_public_resource.title)) + expect(page).to have_content(translated(user_group.name)) + expect(page).to have_no_content(translated(public_resource.title)) + expect(page).to have_no_content(translated(non_public_resource.name)) + end + end + + context "when the user follows a blocked user" do + let(:blocked_user) { create(:user, :blocked) } + + before do + create(:follow, user:, followable: blocked_user) + end + + it "lists only the unblocked followings" do + visit decidim.profile_path(user.nickname) + + click_link "Follows" + expect(page).to have_content("Some of the resources followed are not public.") + expect(page).to have_content(translated(other_user.name)) + expect(page).to have_content(translated(user_to_follow.name)) + expect(page).to have_content(translated(user_group.name)) + expect(page).to have_no_content(translated(public_resource.title)) + end + end + + context "when the user is followed by a blocked user" do + let(:blocked_user) { create(:user, :blocked) } + + before do + create(:follow, user: blocked_user, followable: user) + end + + it "lists only the unblocked followers" do + visit decidim.profile_path(user.nickname) + + click_link "Followers" + expect(page).to have_content(translated(other_user.name)) + expect(page).to have_no_content(translated(blocked_user.name)) end end end @@ -140,16 +199,8 @@ end it "shows a badges tab" do - penfing "badges not use" expect(page).to have_link("Badges") end - - it "shows a badges section on the sidebar" do - penfing "badges not use" - within ".profile--sidebar" do - expect(page).to have_css(".badge-container img[title^='Tests']") - end - end end context "when badges are disabled" do @@ -159,13 +210,7 @@ end it "shows a badges tab" do - expect(page).to have_no_link("Badges") - end - - it "doesn't have a badges section on the sidebar" do - within ".profile--sidebar" do - expect(page).to have_no_content("Badges") - end + expect(page).not_to have_link("Badges") end end end @@ -173,7 +218,7 @@ context "when belonging to user groups" do let!(:accepted_user_group) { create(:user_group, users: [user], organization: user.organization) } let!(:pending_user_group) { create(:user_group, users: [], organization: user.organization) } - let!(:pending_membership) { create(:user_group_membership, user_group: pending_user_group, user: user, role: "requested") } + let!(:pending_membership) { create(:user_group_membership, user_group: pending_user_group, user:, role: "requested") } before do visit decidim.profile_path(user.nickname) @@ -184,11 +229,12 @@ expect(page).to have_content(accepted_user_group.name) expect(page).to have_no_content(pending_user_group.name) + expect(page.find('meta[name="robots"]', visible: false)[:content]).to eq("noindex") end context "when user groups are disabled" do let(:organization) { create(:organization, user_groups_enabled: false) } - let(:user) { create(:user, :confirmed, organization: organization) } + let(:user) { create(:user, :confirmed, organization:) } it { is_expected.to have_no_content("Groups") } end @@ -199,7 +245,7 @@ before do allow(Decidim.view_hooks) .to receive(:render) - .with(a_kind_of(Symbol), a_kind_of(Decidim::ProfileSidebarCell)) + .with(a_kind_of(Symbol), a_kind_of(Decidim::ProfileCell)) .and_return("Rendered from #{view_hook} view hook") visit decidim.profile_path(user.nickname) @@ -209,7 +255,7 @@ let(:view_hook) { :user_profile_bottom } it "renders the view hook" do - expect(Decidim.view_hooks).to have_received(:render).with(:user_profile_bottom, a_kind_of(Decidim::ProfileSidebarCell)) + expect(Decidim.view_hooks).to have_received(:render).with(:user_profile_bottom, a_kind_of(Decidim::ProfileCell)) expect(page).to have_content("Rendered from user_profile_bottom view hook") end end From 3c1ddff9dc570c8744833a69928b87c056f2a3d0 Mon Sep 17 00:00:00 2001 From: ayuki_j <19406594+ayuki-joto@users.noreply.github.com> Date: Tue, 19 Mar 2024 13:27:46 +0900 Subject: [PATCH 6/7] fix: conflict --- Gemfile.lock | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0b4860728..f05b32afb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,16 +86,16 @@ GEM public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.3.0) - aws-partitions (1.896.0) - aws-sdk-core (3.191.3) + aws-partitions (1.899.0) + aws-sdk-core (3.191.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.77.0) + aws-sdk-kms (1.78.0) aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) + aws-sdk-s3 (1.146.0) aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -104,14 +104,14 @@ GEM base64 (0.2.0) batch-loader (1.5.0) bcrypt (3.1.20) - better_html (2.0.2) + better_html (2.1.0) actionview (>= 6.0) activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.6) + bigdecimal (3.1.7) bindex (0.8.1) bootsnap (1.18.3) msgpack (~> 1.2) @@ -348,7 +348,7 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.12.0) + devise-i18n (1.11.0) devise (>= 4.9.0) devise_invitable (2.0.9) actionmailer (>= 5.0) @@ -377,7 +377,7 @@ GEM temple erubi (1.12.0) escape_utils (1.2.2) - excon (0.109.0) + excon (0.110.0) execjs (2.9.1) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) @@ -403,7 +403,7 @@ GEM file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-aws (3.21.0) + fog-aws (3.22.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -515,8 +515,7 @@ GEM mime-types-data (3.2024.0305) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.22.2) + minitest (5.22.3) msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) @@ -535,8 +534,9 @@ GEM net-protocol newrelic_rpm (9.7.1) nio4r (2.7.0) - nokogiri (1.16.2) - mini_portile2 (~> 2.8.2) + nokogiri (1.16.3-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -690,14 +690,14 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.1) + rspec-rails (6.1.2) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.13.1) @@ -849,7 +849,8 @@ GEM rubyzip (>= 1.0.0) PLATFORMS - ruby + aarch64-linux + arm64-darwin-23 DEPENDENCIES aws-sdk-s3 @@ -888,4 +889,4 @@ RUBY VERSION ruby 3.1.1p18 BUNDLED WITH - 2.2.33 + 2.3.7 From 10eabae38a2023ae099d4ea79d7a2297c8b2ebe6 Mon Sep 17 00:00:00 2001 From: ayuki_j <19406594+ayuki-joto@users.noreply.github.com> Date: Tue, 19 Mar 2024 13:35:29 +0900 Subject: [PATCH 7/7] fix: bundler version --- Dockerfile | 2 +- Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bbcf05437..bc104d83e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ ARG RAILS_ENV="production" ENV LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ BUNDLER_JOBS=4 \ - BUNDLER_VERSION=2.2.33 \ + BUNDLER_VERSION=2.3.7 \ APP_HOME=/app \ RAILS_ENV=${RAILS_ENV} \ RAILS_LOG_TO_STDOUT=true \ diff --git a/Gemfile.lock b/Gemfile.lock index f05b32afb..52b0e7928 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -538,6 +538,8 @@ GEM racc (~> 1.4) nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.3-x86_64-linux) + racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) snaky_hash (~> 2.0) @@ -851,6 +853,7 @@ GEM PLATFORMS aarch64-linux arm64-darwin-23 + x86_64-linux DEPENDENCIES aws-sdk-s3