Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: Fix term customizer inconsistencies by changing module version #47

Merged
merged 1 commit into from
Feb 5, 2024
+10 −10
Merged

backport: Fix term customizer inconsistencies by changing module version #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem "decidim-decidim_awesome", git: "https://github.com/octree-gva/decidim-modul
gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "0.26/without-exports"
gem "decidim-spam_detection"
gem "decidim-term_customizer", git: "https://github.com/armandfardeau/decidim-module-term_customizer.git", branch: "fix/precompile-on-docker-0.26"
gem "decidim-term_customizer", git: "https://github.com/opensourcepolitics/decidim-module-term_customizer.git", branch: "fix/multi-threading-compliant-0.26"

# Omniauth gems
gem "omniauth-france_connect", git: "https://github.com/OpenSourcePolitics/omniauth-france_connect"
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@ GIT
omniauth (~> 2.0)
omniauth-oauth2 (>= 1.7.2, < 2.0)

GIT
remote: https://github.com/armandfardeau/decidim-module-term_customizer.git
revision: 63170f69b51bb7e7f60f20856e944ae1357f4dc7
branch: fix/precompile-on-docker-0.26
specs:
decidim-term_customizer (0.26.0)
decidim-admin (~> 0.26.0)
decidim-core (~> 0.26.0)

GIT
remote: https://github.com/mainio/decidim-module-simple_proposal
revision: b91e238151ec818896bb77d296313406adce7880
Expand All @@ -56,6 +47,15 @@ GIT
decidim-core (>= 0.26.0, < 0.28)
sassc (~> 2.3)

GIT
remote: https://github.com/opensourcepolitics/decidim-module-term_customizer.git
revision: 11724f312f77a0a9199d0c79538058e0e5ae10c8
branch: fix/multi-threading-compliant-0.26
specs:
decidim-term_customizer (0.26.0)
decidim-admin (~> 0.26.0)
decidim-core (~> 0.26.0)

GIT
remote: https://github.com/sgruhier/foundation_rails_helper.git
revision: bc33600db7a2d16ce3cdc1f8369d0d7e7c4245b5
Expand Down
Loading