From 1585a4adb8a8a9415f333e96a54c315d49c0ac42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= Date: Mon, 29 Jul 2024 15:25:33 +0200 Subject: [PATCH] Bump decidim from 0.28.1 to 0.28.2 --- Gemfile | 2 +- Gemfile.lock | 218 +++++++++--------- .../decidim/accountability/status/status.erb | 2 +- .../results/_scope_filters.html.erb | 2 +- .../system/organizations/edit.html.erb | 2 +- .../decidim/footer/_main_links.html.erb | 4 +- package-lock.json | 66 +++--- package.json | 16 +- spec/lib/overrides_spec.rb | 16 +- 9 files changed, 169 insertions(+), 159 deletions(-) diff --git a/Gemfile b/Gemfile index 6240e3f9f..ea2d94ba5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -DECIDIM_VERSION = "~> 0.28.1" +DECIDIM_VERSION = "0.28.2" ruby RUBY_VERSION diff --git a/Gemfile.lock b/Gemfile.lock index a5fa55906..d7163231c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,20 +159,20 @@ GEM base64 (0.2.0) batch-loader (1.5.0) bcrypt (3.1.20) - better_html (2.0.2) + better_html (2.1.1) actionview (>= 6.0) activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.6) + bigdecimal (3.1.8) bindex (0.8.1) bootsnap (1.18.3) msgpack (~> 1.2) browser (2.7.1) builder (3.2.4) - bullet (7.1.6) + bullet (7.2.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -232,55 +232,55 @@ GEM date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) - decidim (0.28.1) - decidim-accountability (= 0.28.1) - decidim-admin (= 0.28.1) - decidim-api (= 0.28.1) - decidim-assemblies (= 0.28.1) - decidim-blogs (= 0.28.1) - decidim-budgets (= 0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-debates (= 0.28.1) - decidim-forms (= 0.28.1) - decidim-generators (= 0.28.1) - decidim-meetings (= 0.28.1) - decidim-pages (= 0.28.1) - decidim-participatory_processes (= 0.28.1) - decidim-proposals (= 0.28.1) - decidim-sortitions (= 0.28.1) - decidim-surveys (= 0.28.1) - decidim-system (= 0.28.1) - decidim-templates (= 0.28.1) - decidim-verifications (= 0.28.1) - decidim-accountability (0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-admin (0.28.1) + decidim (0.28.2) + decidim-accountability (= 0.28.2) + decidim-admin (= 0.28.2) + decidim-api (= 0.28.2) + decidim-assemblies (= 0.28.2) + decidim-blogs (= 0.28.2) + decidim-budgets (= 0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-debates (= 0.28.2) + decidim-forms (= 0.28.2) + decidim-generators (= 0.28.2) + decidim-meetings (= 0.28.2) + decidim-pages (= 0.28.2) + decidim-participatory_processes (= 0.28.2) + decidim-proposals (= 0.28.2) + decidim-sortitions (= 0.28.2) + decidim-surveys (= 0.28.2) + decidim-system (= 0.28.2) + decidim-templates (= 0.28.2) + decidim-verifications (= 0.28.2) + decidim-accountability (0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-admin (0.28.2) active_link_to (~> 1.0) - decidim-core (= 0.28.1) + decidim-core (= 0.28.2) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 2.0, >= 2.0.9) - decidim-api (0.28.1) + decidim-api (0.28.2) commonmarker (~> 0.23.0, >= 0.23.9) - decidim-core (= 0.28.1) + decidim-core (= 0.28.2) graphql (~> 2.0.0) graphql-docs (~> 3.0.1) rack-cors (~> 1.0) - decidim-assemblies (0.28.1) - decidim-core (= 0.28.1) - decidim-blogs (0.28.1) - decidim-admin (= 0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-budgets (0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-comments (0.28.1) - decidim-core (= 0.28.1) + decidim-assemblies (0.28.2) + decidim-core (= 0.28.2) + decidim-blogs (0.28.2) + decidim-admin (= 0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-budgets (0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-comments (0.28.2) + decidim-core (= 0.28.2) redcarpet (~> 3.5, >= 3.5.1) - decidim-core (0.28.1) + decidim-core (0.28.2) active_link_to (~> 1.0) acts_as_list (~> 1.0) batch-loader (~> 1.2) @@ -330,14 +330,14 @@ GEM valid_email2 (~> 4.0) web-push (~> 3.0) wisper (~> 2.0) - decidim-debates (0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-dev (0.28.1) + decidim-debates (0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-dev (0.28.2) bullet (~> 7.0) byebug (~> 11.0) capybara (~> 3.39) - decidim (= 0.28.1) + decidim (= 0.28.2) erb_lint (~> 0.4.0) factory_bot_rails (~> 6.2) faker (~> 3.2) @@ -362,52 +362,52 @@ GEM w3c_rspec_validators (~> 0.3.0) webmock (~> 3.18) wisper-rspec (~> 1.0) - decidim-forms (0.28.1) - decidim-core (= 0.28.1) + decidim-forms (0.28.2) + decidim-core (= 0.28.2) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.28.1) - decidim-core (= 0.28.1) - decidim-initiatives (0.28.1) - decidim-admin (= 0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-verifications (= 0.28.1) + decidim-generators (0.28.2) + decidim-core (= 0.28.2) + decidim-initiatives (0.28.2) + decidim-admin (= 0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-verifications (= 0.28.2) hexapdf (~> 0.32.0) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-meetings (0.28.1) - decidim-core (= 0.28.1) - decidim-forms (= 0.28.1) + decidim-meetings (0.28.2) + decidim-core (= 0.28.2) + decidim-forms (= 0.28.2) icalendar (~> 2.5) - decidim-pages (0.28.1) - decidim-core (= 0.28.1) - decidim-participatory_processes (0.28.1) - decidim-core (= 0.28.1) - decidim-proposals (0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) + decidim-pages (0.28.2) + decidim-core (= 0.28.2) + decidim-participatory_processes (0.28.2) + decidim-core (= 0.28.2) + decidim-proposals (0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) doc2text (~> 0.4.6) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.28.1) - decidim-admin (= 0.28.1) - decidim-comments (= 0.28.1) - decidim-core (= 0.28.1) - decidim-proposals (= 0.28.1) - decidim-surveys (0.28.1) - decidim-core (= 0.28.1) - decidim-forms (= 0.28.1) - decidim-system (0.28.1) + decidim-sortitions (0.28.2) + decidim-admin (= 0.28.2) + decidim-comments (= 0.28.2) + decidim-core (= 0.28.2) + decidim-proposals (= 0.28.2) + decidim-surveys (0.28.2) + decidim-core (= 0.28.2) + decidim-forms (= 0.28.2) + decidim-system (0.28.2) active_link_to (~> 1.0) - decidim-core (= 0.28.1) + decidim-core (= 0.28.2) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 2.0, >= 2.0.9) - decidim-templates (0.28.1) - decidim-core (= 0.28.1) - decidim-forms (= 0.28.1) - decidim-verifications (0.28.1) - decidim-core (= 0.28.1) + decidim-templates (0.28.2) + decidim-core (= 0.28.2) + decidim-forms (= 0.28.2) + decidim-verifications (0.28.2) + decidim-core (= 0.28.2) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -491,7 +491,7 @@ GEM ffi (~> 1.0) globalid (1.2.1) activesupport (>= 6.1) - graphql (2.0.29) + graphql (2.0.31) base64 graphql-docs (3.0.1) commonmarker (~> 0.16) @@ -507,17 +507,17 @@ GEM cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.3) openssl (>= 2.2.1) - highline (3.0.1) + highline (3.1.0) + reline html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) i18n (1.14.4) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.13) + i18n-tasks (1.0.14) activesupport (>= 4.0.2) ast (>= 2.1.0) - better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n @@ -525,14 +525,15 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.10.1) + icalendar (2.10.2) ice_cube (~> 0.16) - ice_cube (0.16.4) + ice_cube (0.17.0) image_processing (1.12.2) 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.8.1) @@ -565,6 +566,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -663,7 +665,7 @@ GEM activerecord (>= 5.2) request_store (~> 1.1) parallel (1.24.0) - parallel_tests (4.5.2) + parallel_tests (4.7.1) parallel parser (3.3.0.5) ast (~> 2.4.1) @@ -761,6 +763,8 @@ GEM redis-client (0.21.0) connection_pool regexp_parser (2.9.0) + reline (0.5.9) + io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) responders (3.1.1) @@ -785,14 +789,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.3) 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) @@ -810,22 +814,25 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.2) parser (>= 3.3.0.4) - rubocop-capybara (2.20.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-factory_bot (2.26.0) rubocop (~> 1.41) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) - rubocop-rails (2.24.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (2.27.1) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.0) + rubocop (~> 1.40) ruby-progressbar (1.13.0) ruby-vips (2.2.1) ffi (~> 1.12) @@ -842,8 +849,9 @@ GEM ffi (~> 1.9) scout_apm (5.3.7) parser - selenium-webdriver (4.18.1) + selenium-webdriver (4.23.0) base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -932,11 +940,11 @@ GEM web-push (3.0.1) jwt (~> 2.0) openssl (~> 3.0) - webmock (3.23.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -962,16 +970,16 @@ DEPENDENCIES codecov dalli database_cleaner - decidim (~> 0.28.1) + decidim (= 0.28.2) decidim-census_sms! decidim-dataviz! decidim-decidim_awesome! - decidim-dev (~> 0.28.1) + decidim-dev (= 0.28.2) decidim-ephemeral_participation! - decidim-initiatives (~> 0.28.1) + decidim-initiatives (= 0.28.2) decidim-kids! decidim-navigation_maps! - decidim-sortitions (~> 0.28.1) + decidim-sortitions (= 0.28.2) decidim-stats! decidim-term_customizer! decidim-valid_auth! diff --git a/app/cells/decidim/accountability/status/status.erb b/app/cells/decidim/accountability/status/status.erb index 6c10497d4..7d937e41a 100644 --- a/app/cells/decidim/accountability/status/status.erb +++ b/app/cells/decidim/accountability/status/status.erb @@ -5,7 +5,7 @@

<%= title %>

<% if component_settings.display_progress_enabled? && progress.present? %> -
+
" aria-valuenow="<%= number_with_precision(progress, separator: ".", precision: 1) %>" aria-valuemin="0" aria-valuemax="100" aria-valuetext="<%= number_to_percentage(progress, precision: 1) %>">
<% end %> diff --git a/app/views/decidim/accountability/results/_scope_filters.html.erb b/app/views/decidim/accountability/results/_scope_filters.html.erb index 2da0a23d0..7c648c9d6 100644 --- a/app/views/decidim/accountability/results/_scope_filters.html.erb +++ b/app/views/decidim/accountability/results/_scope_filters.html.erb @@ -5,7 +5,7 @@ <% if current_component.has_subscopes? && !hide_subscopes %>
-
- <% if @organization.users.first&.invitation_pending? %> + <% if @organization&.users&.first&.invitation_pending? %> <%= link_to t(".resend_invitation"), resend_invitation_organization_path(@organization), method: :post, diff --git a/decidim-ephemeral_participation/app/views/layouts/decidim/footer/_main_links.html.erb b/decidim-ephemeral_participation/app/views/layouts/decidim/footer/_main_links.html.erb index 5cbe766a0..acdc2e47c 100644 --- a/decidim-ephemeral_participation/app/views/layouts/decidim/footer/_main_links.html.erb +++ b/decidim-ephemeral_participation/app/views/layouts/decidim/footer/_main_links.html.erb @@ -4,7 +4,9 @@

<%= t("layouts.decidim.footer.resources") %>

  • <%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %>
    • -
  • <%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %>
    • + <% if Decidim.module_installed?(:meetings) %> +
  • <%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %>
    • + <% end %>
  • <%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %>
diff --git a/package-lock.json b/package-lock.json index 56aa03a89..2acc3a1ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,10 +8,10 @@ "name": "app", "version": "0.1.0", "dependencies": { - "@decidim/browserslist-config": "^0.28.1", - "@decidim/core": "^0.28.1", - "@decidim/elections": "^0.28.1", - "@decidim/webpacker": "^0.28.1", + "@decidim/browserslist-config": "^0.28.2", + "@decidim/core": "^0.28.2", + "@decidim/elections": "^0.28.2", + "@decidim/webpacker": "^0.28.2", "@geoman-io/leaflet-geoman-free": "^2.16.0", "@rails/actioncable": "^6.1.7", "@rails/webpacker": "^6.0.0-rc.6", @@ -44,10 +44,10 @@ "@babel/plugin-transform-runtime": "^7.24.3", "@babel/preset-env": "^7.24.3", "@babel/preset-react": "^7.24.1", - "@decidim/dev": "^0.28.1", - "@decidim/eslint-config": "^0.28.1", - "@decidim/prettier-config": "^0.28.1", - "@decidim/stylelint-config": "^0.28.1", + "@decidim/dev": "^0.28.2", + "@decidim/eslint-config": "^0.28.2", + "@decidim/prettier-config": "^0.28.2", + "@decidim/stylelint-config": "^0.28.2", "@webpack-cli/serve": "^1.6.1", "eslint-config-prettier": "^8.10.0", "eslint-plugin-import": "^2.29.0", @@ -2900,14 +2900,14 @@ } }, "node_modules/@decidim/browserslist-config": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/browserslist-config/-/browserslist-config-0.28.1.tgz", - "integrity": "sha512-flk7T/BlYosqrRZDNJDyXAuXpMvdC49wSDidHH7l6P0YZ5p1dxPYC1r6LmWvTTw5ruyDANvOR5Zvo7kICc5QEw==" + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/browserslist-config/-/browserslist-config-0.28.2.tgz", + "integrity": "sha512-lfMHcbbnjzsh3g8s4DmwVW/9iPbodQZo6o22Saj/jAsWqAuuTxPWCd/pjNxf5XvXwyZoCqK7jrElFwhEtKBbiw==" }, "node_modules/@decidim/core": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/core/-/core-0.28.1.tgz", - "integrity": "sha512-ciFcB6+LVD1dgDgZby51o8DqJk5c9eB3kuIGgHTcg7D+5iGXvjeKCo8zU0VIAoICYQfSAS1AQvkfqaHoRQiYIA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/core/-/core-0.28.2.tgz", + "integrity": "sha512-vhQLiiSWifWrinWURyxfph6x9KW2V2jis7B7VQyThc9SCshR0wlTTuea5cAzo7zCoBM6pl2z92YGlahEZIyIjg==", "dependencies": { "@picmo/popup-picker": "^5.8.4", "@rails/activestorage": "^6.0.4", @@ -2997,9 +2997,9 @@ } }, "node_modules/@decidim/dev": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/dev/-/dev-0.28.1.tgz", - "integrity": "sha512-s3TwpmhZLwXXzafg7NoFxNoWUgPEEC9exH3fye+gx8PcPWAFcAlebgsONG8/TB0R3ikDcfI8fy6IHt4baVVpdg==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/dev/-/dev-0.28.2.tgz", + "integrity": "sha512-1w37qHMSsw5VagsgA6vzVs7FG+85dAr690BvcLT8jYcU4JLUvFc+vnGPa+Qi7Kpo7BjgOri+YfScpeO7OUJJMA==", "dev": true, "dependencies": { "@linthtml/linthtml": "^0.9.6", @@ -3008,9 +3008,9 @@ } }, "node_modules/@decidim/elections": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/elections/-/elections-0.28.1.tgz", - "integrity": "sha512-EPa73JBiumINNIz9OAUhWOp6OVcrkzhKnbHEmTDG6MUS0UkgX1VgbVxcDMWCKpNJJdweZs4+jCbGWgi9E7qRGA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/elections/-/elections-0.28.2.tgz", + "integrity": "sha512-CtJJzTM5+mX3puc1ADK9z8rhqwt0+lBtVbmFZkEMf4XjL8YCvc/hzACp0t30fQY0A2Bw+DEBfPGn5EVtkTC/eQ==", "dependencies": { "@decidim/decidim-bulletin_board": "0.24.4", "@decidim/voting_schemes-dummy": "0.24.4", @@ -3018,9 +3018,9 @@ } }, "node_modules/@decidim/eslint-config": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/eslint-config/-/eslint-config-0.28.1.tgz", - "integrity": "sha512-5HmLnR3+6JOYssOGqLHYmsfsk9MBX8LP3MXcsLjkCw3Rk9toHFHrRPj6mwwEAxLHFlO3QsJel/hLHpP9cHcVgA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/eslint-config/-/eslint-config-0.28.2.tgz", + "integrity": "sha512-fv40EstkhIHB/Bhu2wyqd3yPEpO/aUYWZOiYeUpwRI+aHev5TKTpKnXEHLkOMmJEYc6FuHgADBQcFrPrqOMxlQ==", "dev": true, "peerDependencies": { "eslint": "^8.7.0", @@ -3036,18 +3036,18 @@ } }, "node_modules/@decidim/prettier-config": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/prettier-config/-/prettier-config-0.28.1.tgz", - "integrity": "sha512-fmjs6hcWkcm+9BmFlDCDCAzBXeFn/1J8vlmgSFcoEZyukM3rE4NQIS2AsypP2CcuA3st9Ybn0uf1Mrx9u+rHdA==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/prettier-config/-/prettier-config-0.28.2.tgz", + "integrity": "sha512-UHvbkRfh8LHnEMV5NT365Ggb2V6eQp6jJwwQ0teJbX4Ax0KTuX5hMLkNkEzUGnpmpYPativx8Pn2A773eN603w==", "dev": true, "peerDependencies": { "prettier": "^2.3.2" } }, "node_modules/@decidim/stylelint-config": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/stylelint-config/-/stylelint-config-0.28.1.tgz", - "integrity": "sha512-AT+NsVMA0DZOKuFse9tTYDfV5En4wwNZ6txbLGZh8VE5EDk1v2yr7eVdi+Y7CA3LHbzW1q7SbFr5SRfdMxhntw==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/stylelint-config/-/stylelint-config-0.28.2.tgz", + "integrity": "sha512-/+mfiOPqrB7RJ9ACdiLJ2rO5yDz3/NSWZUk4q6ZYOzccbqO0AA/tZh+xUxWQ83zRkRKCkjvPmySqjvzAdpKPoA==", "dev": true, "peerDependencies": { "stylelint": "^15.3.0", @@ -3065,9 +3065,9 @@ "integrity": "sha512-EKTdPKaKIykDtcN/pe0s1HmUuLvan9bEakoDJ9wJNVcYbRtffsb6RaG3LBC6dVPAZYwtem3t0zVHUbIVCCnlCw==" }, "node_modules/@decidim/webpacker": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/@decidim/webpacker/-/webpacker-0.28.1.tgz", - "integrity": "sha512-jYTLo9gPq3Pc37P92iehGWaL40QXqc2mx+OXD8zV8tXpp8ahgE+j2qXFGe66Z75KSOpzWIxxS3+jiaBRA+IthQ==", + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@decidim/webpacker/-/webpacker-0.28.2.tgz", + "integrity": "sha512-xkkHMwso48bjWw6WbeuZjmj3mgLDn6GT+ZDk8Qz23Af1yOyWB404zOkJiDu8DAp6lFxzVFXfo62DSYNgE+8zGg==", "dependencies": { "@babel/core": "^7.22.9", "@babel/eslint-parser": "^7.22.9", @@ -3100,7 +3100,7 @@ "shakapacker": "~7.1.0", "source-map-loader": "^4.0.1", "style-loader": "^3.3.3", - "tailwindcss": "^3.3.2", + "tailwindcss": "3.4.1", "terser-webpack-plugin": "^5.3.9", "webpack": "^5.88.1", "webpack-assets-manifest": "^5.1.0", diff --git a/package.json b/package.json index 4d3d3319c..490bed7a3 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "app", "private": true, "dependencies": { - "@decidim/browserslist-config": "^0.28.1", - "@decidim/core": "^0.28.1", - "@decidim/elections": "^0.28.1", - "@decidim/webpacker": "^0.28.1", + "@decidim/browserslist-config": "^0.28.2", + "@decidim/core": "^0.28.2", + "@decidim/elections": "^0.28.2", + "@decidim/webpacker": "^0.28.2", "@geoman-io/leaflet-geoman-free": "^2.16.0", "@rails/actioncable": "^6.1.7", "@rails/webpacker": "^6.0.0-rc.6", @@ -59,10 +59,10 @@ "@babel/plugin-transform-runtime": "^7.24.3", "@babel/preset-env": "^7.24.3", "@babel/preset-react": "^7.24.1", - "@decidim/dev": "^0.28.1", - "@decidim/eslint-config": "^0.28.1", - "@decidim/prettier-config": "^0.28.1", - "@decidim/stylelint-config": "^0.28.1", + "@decidim/dev": "^0.28.2", + "@decidim/eslint-config": "^0.28.2", + "@decidim/prettier-config": "^0.28.2", + "@decidim/stylelint-config": "^0.28.2", "@webpack-cli/serve": "^1.6.1", "eslint-config-prettier": "^8.10.0", "eslint-plugin-import": "^2.29.0", diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb index 3f24f08a6..43fa9d7fb 100644 --- a/spec/lib/overrides_spec.rb +++ b/spec/lib/overrides_spec.rb @@ -21,7 +21,7 @@ "/app/permissions/decidim/permissions.rb" => "36a9c31bbf17685e80acff49f6e9b0ca", # ephemeral participation overrides "/app/views/decidim/shared/_login_modal.html.erb" => "a29d4fcebe8c689044e3c15f6144f3d1", # ephemeral participation overrides "/app/views/layouts/decidim/mailer.html.erb" => "4e308c82acd8b1dac405ff71963d8743", - "/app/views/layouts/decidim/footer/_main_links.html.erb" => "60a25ee1b5c6c3702a3d158ac9e23013", # ephemeral participation overrides + "/app/views/layouts/decidim/footer/_main_links.html.erb" => "e35f39aa247534377219915b1632e354", # ephemeral participation overrides "/app/views/layouts/decidim/header/_main_links_dropdown.html.erb" => "a369664c2bb36cbd2b10d90d9a7469cf", # ephemeral participation overrides "/app/cells/decidim/content_blocks/last_activity_cell.rb" => "22355fa93da7c8776e7e7f56a5b207f7", "/app/cells/decidim/activities_cell.rb" => "dd17416a8d1efe7f26b1e759613e4db4", @@ -63,8 +63,8 @@ { package: "decidim-system", files: { - "/app/forms/decidim/system/update_organization_form.rb" => "a1059e5a8745a2637703b6805deda53c", # ephemeral participation overrides - "/app/views/decidim/system/organizations/edit.html.erb" => "b3ca773290213f267c5d6f0083aca539", # ephemeral participation overrides + "/app/forms/decidim/system/update_organization_form.rb" => "9a02716952d6f75ece982fe592264803", # ephemeral participation overrides + "/app/views/decidim/system/organizations/edit.html.erb" => "516a13590ebb867585f74da71d2d157a", # ephemeral participation overrides "/app/views/decidim/system/organizations/new.html.erb" => "4916cdb428d89de5afe60e279d64112f" # ephemeral participation overrides } }, @@ -75,12 +75,12 @@ "/app/views/decidim/accountability/admin/results/index.html.erb" => "633d8dd325d917ba4cfd8500052a3dcf", "/app/views/decidim/participatory_spaces/_result.html.erb" => "36add6a46776f600922fa04099a20909", "/app/cells/decidim/accountability/result_l/extra_data.erb" => "58368fec1e36bff35cc3ea24c2109076", - "/app/cells/decidim/accountability/status_cell.rb" => "fa12f456df90a94cde1cbb3c576172df", - "/app/cells/decidim/accountability/status/status.erb" => "d6e3d97dcc7cf8613047a6d2549e0e27", + "/app/cells/decidim/accountability/status_cell.rb" => "6ca4eca3af487284dcb6caae19200596", + "/app/cells/decidim/accountability/status/status.erb" => "f9a9e64f6a4c503d6cd8b49cb6f9b197", "/app/views/decidim/accountability/results/home.html.erb" => "4050a327e040350e247c9086fc432cde", "/app/views/decidim/accountability/results/index.html.erb" => "1b655348f4e689fb27b2892846faf586", "/app/views/decidim/accountability/results/_home_categories.html.erb" => "00721e6e14f5ad718a3d80ecd905999e", - "/app/views/decidim/accountability/results/_scope_filters.html.erb" => "02f6546d773cab4a8c006ffaf86e625e", + "/app/views/decidim/accountability/results/_scope_filters.html.erb" => "457ac0cce5522504d0a33a245cd424d4", "/app/views/decidim/accountability/results/_stats_box.html.erb" => "2ce34e1ee1a824dc4fbe36940c97f3e8", "/app/models/decidim/accountability/result.rb" => "e1c063ba7c39ca8996daa740c7ff6bc6", "/app/services/decidim/accountability/results_calculator.rb" => "4cc5ed480220f0bfe7561ad887e59576" @@ -103,7 +103,7 @@ "/app/cells/decidim/meetings/online_meeting_link/show.erb" => "e1cc26b535c8ee0b1c731219c4d5f121", "/app/cells/decidim/meetings/online_meeting_cell.rb" => "726b1c957fdadd355171364b3327564a", "/app/cells/decidim/meetings/join_meeting_button_cell.rb" => "b7bba47ba0a6466a14dbd3798c2e620b", - "/app/models/decidim/meetings/meeting.rb" => "2998095d4eb8fcacd83700098de6c285", + "/app/models/decidim/meetings/meeting.rb" => "537ffce1e21b15d5afcdc0aed2a0f7e8", "/app/controllers/decidim/meetings/meetings_controller.rb" => "b5cb5d2f044b30d348f891f56f851a02", "/app/helpers/decidim/meetings/meetings_helper.rb" => "8be62c6b0cc2f13d4be68eb5e06217de", "/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb" => "7e24a3e70c213dcbc046275cb438744d" @@ -112,7 +112,7 @@ { package: "decidim-proposals", files: { - "/app/helpers/decidim/proposals/application_helper.rb" => "89df14045349cc2eaaec78f79f6140b1", + "/app/helpers/decidim/proposals/application_helper.rb" => "317b0347528e697fa405a792bcfa3db8", "/app/presenters/decidim/proposals/proposal_presenter.rb" => "72910541010305f25baf297f4a58497b" } },