From efd94e50036156ae053bb7dd3d589bdb5be2c3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Tue, 3 Sep 2024 12:00:18 +0200 Subject: [PATCH] Fix exceptions with when not added explicitly (#13333) * Remove decidim-templates dependency from decidim meta-gem * Make decidim-proposals a development dependency to decidim-templates * Fix bug with checking for the decidim-templates gem on templates choosers' partials --------- Co-authored-by: Alexandru Emil Lupu --- Gemfile.lock | 1 - decidim-generators/Gemfile.lock | 1 - decidim-templates/decidim-templates.gemspec | 1 + decidim.gemspec | 1 - decidim_app-design/Gemfile.lock | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0f60e5d0f6dfc..57e7190704782 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,7 +20,6 @@ PATH decidim-sortitions (= 0.27.8) decidim-surveys (= 0.27.8) decidim-system (= 0.27.8) - decidim-templates (= 0.27.8) decidim-verifications (= 0.27.8) decidim-accountability (0.27.8) decidim-comments (= 0.27.8) diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock index 96deb8f85eba8..d783efe69e4c3 100644 --- a/decidim-generators/Gemfile.lock +++ b/decidim-generators/Gemfile.lock @@ -20,7 +20,6 @@ PATH decidim-sortitions (= 0.27.8) decidim-surveys (= 0.27.8) decidim-system (= 0.27.8) - decidim-templates (= 0.27.8) decidim-verifications (= 0.27.8) decidim-accountability (0.27.8) decidim-comments (= 0.27.8) diff --git a/decidim-templates/decidim-templates.gemspec b/decidim-templates/decidim-templates.gemspec index ccd970ce2c093..376197eb1fbd5 100644 --- a/decidim-templates/decidim-templates.gemspec +++ b/decidim-templates/decidim-templates.gemspec @@ -29,5 +29,6 @@ Gem::Specification.new do |s| s.add_development_dependency "decidim-admin", Decidim::Templates.version s.add_development_dependency "decidim-dev", Decidim::Templates.version s.add_development_dependency "decidim-participatory_processes", Decidim::Templates.version + s.add_development_dependency "decidim-proposals", Decidim::Templates.version s.add_development_dependency "decidim-surveys", Decidim::Templates.version end diff --git a/decidim.gemspec b/decidim.gemspec index bda7e6721b51f..9fba28a2c127d 100644 --- a/decidim.gemspec +++ b/decidim.gemspec @@ -56,7 +56,6 @@ Gem::Specification.new do |s| s.add_dependency "decidim-sortitions", Decidim.version s.add_dependency "decidim-surveys", Decidim.version s.add_dependency "decidim-system", Decidim.version - s.add_dependency "decidim-templates", Decidim.version s.add_dependency "decidim-verifications", Decidim.version s.add_development_dependency "bundler", "~> 2.2", ">= 2.2.18" diff --git a/decidim_app-design/Gemfile.lock b/decidim_app-design/Gemfile.lock index 81b20e2b192e6..bda8ca50423dd 100644 --- a/decidim_app-design/Gemfile.lock +++ b/decidim_app-design/Gemfile.lock @@ -20,7 +20,6 @@ PATH decidim-sortitions (= 0.27.8) decidim-surveys (= 0.27.8) decidim-system (= 0.27.8) - decidim-templates (= 0.27.8) decidim-verifications (= 0.27.8) decidim-accountability (0.27.8) decidim-comments (= 0.27.8)