From 98da850f30952fce7a18f793b5bc824f8ce4c4f8 Mon Sep 17 00:00:00 2001 From: Lucie Grau Date: Thu, 6 Feb 2025 11:34:10 +0100 Subject: [PATCH] Backport: fix Half sign up --- Gemfile | 2 +- Gemfile.lock | 6 +++--- config/initializers/half_signup.rb | 3 ++- config/sidekiq.yml | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 267eb84..04d8f96 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "decidim-custom_proposal_states", git: "https://github.com/alecslupu-pfa/dec gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: DECIDIM_BRANCH gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: "temp/twilio-compatibility-0.27" gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git" -gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "feature/half_signup_and_budgets_booth" +gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "middleware-1.0.0" gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH gem "decidim-simple_proposal", git: "https://github.com/opensourcepolitics/decidim-module-simple_proposal.git", branch: DECIDIM_BRANCH gem "decidim-slider", git: "https://github.com/OpenSourcePolitics/decidim-module-slider", branch: "rc/0.27" diff --git a/Gemfile.lock b/Gemfile.lock index fa8c9b6..61700e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,8 +25,8 @@ GIT GIT remote: https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git - revision: 5bee2b5422e4131f933ad854ab872e049dcf7b54 - branch: feature/half_signup_and_budgets_booth + revision: 3595311ab355312986f11e38f8c38638832342a2 + branch: middleware-1.0.0 specs: decidim-half_signup (0.27.0) countries (~> 5.1, >= 5.1.2) @@ -1100,4 +1100,4 @@ RUBY VERSION ruby 3.0.6p216 BUNDLED WITH - 2.4.6 + 2.4.9 diff --git a/config/initializers/half_signup.rb b/config/initializers/half_signup.rb index 33b7294..5b7e79c 100644 --- a/config/initializers/half_signup.rb +++ b/config/initializers/half_signup.rb @@ -8,4 +8,5 @@ config.default_countries = ENV.fetch("AVAILABLE_LOCALES", "fr").split(",").map(&:to_sym) config.skip_csrf = ENV.fetch("HALF_SIGNUP_SKIP_CSRF", "false") == "true" -end + config.show_sms_verification_code = ENV.fetch("HALF_SIGNUP_SHOW_SMS_VERIFICATION_CODE", "false") == "true" +end \ No newline at end of file diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 22022ea..6abd250 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -48,3 +48,8 @@ class: Decidim::SpamDetection::BlockUsersJob queue: default enabled: false + ArchiveUsersPhone: + cron: '0 <%= Random.rand(0..59) %> <%= Random.rand(6..8) %> * * *' # Run randomly between 06:00 and 08:59 + class: ArchiveUsersPhoneJob + queue: default + enabled: false