From 420251311fc7fe297e15c14773ee57254eaf2fe1 Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Tue, 12 Nov 2024 10:43:35 +0100 Subject: [PATCH] Fixes in members pickers and department admin related with upgrade --- Gemfile | 4 ++-- Gemfile.lock | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index d65e01b8..2256ea41 100644 --- a/Gemfile +++ b/Gemfile @@ -17,11 +17,11 @@ gem "decidim-top_comments", path: "decidim-top_comments" gem "decidim-cdtb" gem "decidim-challenges", git: "https://github.com/gencat/decidim-module-challenges.git", tag: "v0.3.3" -gem "decidim-department_admin", git: "https://github.com/gencat/decidim-module-department_admin.git", tag: "v0.7.1" +gem "decidim-department_admin", git: "https://github.com/gencat/decidim-module-department_admin.git", branch: "fix/participatory_space_resourceable_decorator" gem "decidim-idcat_mobil" gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "release/0.27-stable" -gem "decidim-verifications-members_picker", git: "https://github.com/gencat/decidim-verifications-members_picker.git", tag: "0.0.6" +gem "decidim-verifications-members_picker", git: "https://github.com/gencat/decidim-verifications-members_picker.git", branch: "fix/translation_on_first_login" #### Custom gems and modifications block end #### gem "soda-ruby", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 25ba92c5..1cb23e03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/CodiTramuntana/decidim - revision: 21c297b5feafdeae836090a3a4ed3766aae3a69d + revision: e9bce93641db6629b509918e778af2afac808e99 branch: release/0.27-stable specs: decidim (0.27.9) @@ -180,19 +180,19 @@ GIT GIT remote: https://github.com/gencat/decidim-module-department_admin.git - revision: 602ccc34738762824e464294e74958b26636840d - tag: v0.7.1 + revision: a45aff48033e6a0ca233ffec80e482f0e8c054b7 + branch: fix/participatory_space_resourceable_decorator specs: - decidim-department_admin (0.7.1) + decidim-department_admin (0.7.2) decidim-admin (~> 0.27.0) decidim-core (~> 0.27.0) GIT remote: https://github.com/gencat/decidim-verifications-members_picker.git - revision: ee3a97421eeab3b21c8a6f8947830a91837ba2b9 - tag: 0.0.6 + revision: 2da90dfa1a317c9d60d3661ae77c269274113a64 + branch: fix/translation_on_first_login specs: - decidim-verifications-members_picker (0.0.6) + decidim-verifications-members_picker (0.0.6.1) decidim-core (>= 0.27.5) decidim-verifications (>= 0.27.5) psych (< 4) @@ -310,8 +310,9 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) - axe-core-api (4.10.0) + axe-core-api (4.10.2) dumb_delegator + ostruct virtus axe-core-rspec (4.1.0) axe-core-api @@ -546,7 +547,7 @@ GEM invisible_captcha (0.13.0) rails (>= 3.2.0) io-console (0.7.2) - json (2.7.2) + json (2.8.1) jwt (2.8.2) base64 kaminari (1.2.2) @@ -604,7 +605,7 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.8) + mixlib-shellout (3.3.4) chef-utils msgpack (1.7.2) multi_xml (0.6.0) @@ -664,6 +665,7 @@ GEM omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) + ostruct (0.6.1) paper_trail (12.3.0) activerecord (>= 5.2) request_store (~> 1.1) @@ -750,7 +752,7 @@ GEM redcarpet (3.6.0) redis (4.8.1) regexp_parser (2.9.2) - reline (0.5.10) + reline (0.5.11) io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) @@ -897,7 +899,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.23.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0)