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

Homepage proposals 2.0 fix #80

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Homepage proposals 2.0 fix #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7cb9023
Update the module with the fix
simonaszilinskas Nov 23, 2023
bbdd0cf
fix how the bump is done
simonaszilinskas Nov 27, 2023
9564016
Update of the branch for homepage proposals
simonaszilinskas Nov 29, 2023
9cf8fdc
Merge branch 'develop' into homepage-proposals-2.0-fix
moustachu Nov 29, 2023
f674033
fix Gemfile.lock
moustachu Nov 29, 2023
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
3 changes: 1 addition & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ gem "decidim-budgets_paper_ballots", git: "https://github.com/digidemlab/decidim
gem "decidim-decidim_awesome"
gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up", branch: DECIDIM_BRANCH
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
# gem "decidim-homepage_proposals", git: "https://github.com/OpenSourcePolitics/decidim-module_homepage_proposals.git", branch: DECIDIM_BRANCH
gem "decidim-homepage_proposals", git: "https://github.com/alecslupu-pfa/decidim-module_homepage_proposals", branch: "release/0.26-bulk-deploy"
gem "decidim-homepage_proposals", git: "https://github.com/alecslupu-pfa/decidim-module_homepage_proposals", branch: "release/0.26-stable"
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH
gem "decidim-simple_proposal", git: "https://github.com/mainio/decidim-module-simple_proposal", branch: DECIDIM_BRANCH
gem "decidim-slider", git: "https://github.com/alecslupu-pfa/decidim-module-slider", branch: "main"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ GIT

GIT
remote: https://github.com/alecslupu-pfa/decidim-module_homepage_proposals
revision: 6e3b7a2bfc6e531bb77a4d8ebfb7dd190acee681
branch: release/0.26-bulk-deploy
revision: 905b8a43403b7042fab9ad7d229ef5df4c11c632
branch: release/0.26-stable
specs:
decidim-homepage_proposals (1.0.2)
decidim-core (~> 0.26)
Expand Down
Loading