bump develop from master #145
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bump master
* Add a matrix to system tests (#209) * Add a matrix to system tests * Add tests for rspec runner * Introduce include * Introduce exclude * Setup exclude group matrix * Run 12 tests in parallel * Use destructuration * Log to stdout * Don't run on examples * Add assets cache (#213) * Add assets cache * Remove commit sha from cache key * Generate hash for assets * Fix offenses * Add packages * Use cache hash as litteral * Use lib assets as assets pattern * Dry up * Fix typo * Fix offenses * Add tests (#214) * Run test in parallel (#212) * Run test in parallel * Fix offenses * Fix tests * Add task test:run_all * Fix parallel execution * Fix tests * Fix assets hash (#217) * Chain commands * Upgrade workflow version * Remove useless cache for yarn * Remove useless key # Conflicts: # .github/workflows/tests.yml # Gemfile.lock * Refactor migrations tools (#329) # Conflicts: # lib/tasks/k8s.rake # lib/tasks/scaleway.rake * Feat: add s3 host env (#341) Co-authored-by: Armand Fardeau <[email protected]> # Conflicts: # config/storage.yml * Remove duplicate entry (#323) * Refactor Rack Attack configuration (#312) * Add proxy and remote_ip to rack attack * Add Rack Attack configuration * Add unauthorized path for fail2ban * Refactor Rack Attack configuration * Load decidim-app config * Fix rubocop offenses * Allow to add proxy ip to Rack Attack and Action Dispatch safelist * Add application.rb specs * Update secrets.yml * Add specs for DecidimApp config * Add DecidimApp Rack Attack specs * Remove spec file * Add rack attack throttling specs * Add specs for Fail2ban * Revert changes in db/schema.rb * Fix not interpreted error * Remove trusted proxies configuration * Remove trusted proxies configuration # Conflicts: # config/initializers/decidim.rb # config/initializers/rack_attack.rb # config/locales/fr.yml * Improves coverage (#330) # Conflicts: # lib/initializers/sentry_setup.rb # spec/lib/sentry_setup_spec.rb * Make task idempotent (#336) Co-authored-by: Quentin Champenois <[email protected]> * Add upgrade rake task (#337) * Add upgrade task * Add task * Add pull request trigger (#342) # Conflicts: # .github/workflows/ci_cd.yml * Move to K8s namespace # Conflicts: # lib/k8s_configuration_exporter.rb # lib/k8s_organization_exporter.rb # lib/tasks/k8s.rake # spec/lib/k8s/configuration_exporter_spec.rb # spec/lib/k8s/organization_exporter_spec.rb # spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb * Fix dump_db task * Fix dump path * Use memcached store in production (#347) # Conflicts: # docker-compose.yml * Create organization, system admin and admin from YAML (#339) Co-authored-by: Quentin Champenois <[email protected]> Co-authored-by: quentinchampenois <[email protected]> # Conflicts: # lib/tasks/decidim_app.rake # spec/lib/decidim/admin_creator_spec.rb # spec/lib/decidim/system_admin_creator_spec.rb # spec/lib/tasks/create_admin_task_spec.rb # spec/lib/tasks/create_system_admin_task_spec.rb * Fix environment variables issue (#349) * K8S - Check if secondary hosts are valid (#350) * Fix secondary hosts checker (#351) * K8S - Raise error if file does not exist (#353) * Add install hook (#352) * Use Rails cache instead of defining new one (#354) * Update organization_exporter.rb (#357) * Fix organization update (#356) Co-authored-by: Quentin Champenois <[email protected]> * Fix rack attack config (#358) # Conflicts: # spec/system/confirmation_spec.rb * Cleanup rake tasks (#288) # Conflicts: # lib/tasks/db.rake # lib/tasks/repair_data.rake # lib/tasks/restore_dump.rake * Replace HTTPS tests with HTTP (#359) Co-authored-by: Armand Fardeau <[email protected]> * Fix invalid users (#361) * Exlude healthchecks from ssl (#363) # Conflicts: # config/environments/production.rb * Fix export when smtp settings are nil (#362) * Refactor migrations tools (#329) # Conflicts: # spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb * Refactor Rack Attack configuration (#312) * Add proxy and remote_ip to rack attack * Add Rack Attack configuration * Add unauthorized path for fail2ban * Refactor Rack Attack configuration * Load decidim-app config * Fix rubocop offenses * Allow to add proxy ip to Rack Attack and Action Dispatch safelist * Add application.rb specs * Update secrets.yml * Add specs for DecidimApp config * Add DecidimApp Rack Attack specs * Remove spec file * Add rack attack throttling specs * Add specs for Fail2ban * Revert changes in db/schema.rb * Fix not interpreted error * Remove trusted proxies configuration * Remove trusted proxies configuration # Conflicts: # config/initializers/decidim.rb # config/initializers/rack_attack.rb # spec/lib/decidim_app/rack_attack/fail2ban_spec.rb # spec/lib/decidim_app/rack_attack_spec.rb * Improves coverage (#330) # Conflicts: # spec/lib/decidim_app/rack_attack/fail2ban_spec.rb * Make task idempotent (#336) Co-authored-by: Quentin Champenois <[email protected]> # Conflicts: # lib/decidim/admin_creator.rb # lib/decidim/system_admin_creator.rb * Add upgrade rake task (#337) * Add upgrade task * Add task * Move to K8s namespace # Conflicts: # lib/k8s_configuration_exporter.rb # lib/k8s_organization_exporter.rb # lib/tasks/decidim_app.rake # lib/tasks/k8s.rake # spec/lib/k8s/configuration_exporter_spec.rb # spec/lib/k8s/organization_exporter_spec.rb # spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb * Fix dump_db task * Fix dump path * Create organization, system admin and admin from YAML (#339) Co-authored-by: Quentin Champenois <[email protected]> Co-authored-by: quentinchampenois <[email protected]> # Conflicts: # lib/decidim_app/config.rb # lib/decidim_app/k8s/commands/organization.rb # lib/decidim_app/k8s/configuration.rb # lib/decidim_app/k8s/organization_exporter.rb # lib/decidim_app/rack_attack.rb # spec/fixtures/k8s_configuration_example.yml # spec/lib/decidim/admin_creator_spec.rb # spec/lib/decidim/system_admin_creator_spec.rb # spec/lib/decidim_app/k8s/commands/organization_spec.rb # spec/lib/decidim_app/k8s/configuration_spec.rb # spec/lib/decidim_app/k8s/organization_exporter_spec.rb # spec/lib/tasks/create_admin_task_spec.rb # spec/lib/tasks/create_system_admin_task_spec.rb # spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb # spec/lib/tasks/decidim_app/k8s/external_install_or_reload_task_spec.rb # spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb * Fix environment variables issue (#349) # Conflicts: # lib/decidim_app/k8s/organization_exporter.rb # spec/lib/decidim_app/k8s/organization_exporter_spec.rb * K8S - Check if secondary hosts are valid (#350) # Conflicts: # lib/decidim_app/k8s/secondary_hosts_checker.rb # spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb * Fix secondary hosts checker (#351) # Conflicts: # lib/decidim_app/k8s/secondary_hosts_checker.rb # spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb * K8S - Raise error if file does not exist (#353) # Conflicts: # spec/lib/tasks/decidim_app/k8s/external_install_or_reload_task_spec.rb * Add install hook (#352) * Use Rails cache instead of defining new one (#354) * Update organization_exporter.rb (#357) * Fix organization update (#356) Co-authored-by: Quentin Champenois <[email protected]> # Conflicts: # lib/decidim_app/k8s/commands/organization.rb # lib/decidim_app/k8s/configuration.rb # spec/fixtures/k8s_configuration_example.yml # spec/lib/decidim_app/k8s/commands/organization_spec.rb # spec/lib/decidim_app/k8s/configuration_spec.rb * Fix rack attack config (#358) # Conflicts: # lib/decidim_app/config.rb # lib/decidim_app/rack_attack.rb # spec/lib/decidim_app/rack_attack_spec.rb * Cleanup rake tasks (#288) # Conflicts: # app/services/decidim/repair_nickname_service.rb # lib/tasks/restore_dump.rake # spec/services/decidim/repair_nickname_service_spec.rb * Replace HTTPS tests with HTTP (#359) Co-authored-by: Armand Fardeau <[email protected]> * Fix invalid users (#361) # Conflicts: # app/services/decidim/repair_nickname_service.rb # spec/services/decidim/repair_nickname_service_spec.rb * Fix export when smtp settings are nil (#362) * Revert "Add pull request trigger (#342)" This reverts commit b4eb3f0. * Refactor migrations tools (#329) # Conflicts: # spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb * Refactor Rack Attack configuration (#312) * Add proxy and remote_ip to rack attack * Add Rack Attack configuration * Add unauthorized path for fail2ban * Refactor Rack Attack configuration * Load decidim-app config * Fix rubocop offenses * Allow to add proxy ip to Rack Attack and Action Dispatch safelist * Add application.rb specs * Update secrets.yml * Add specs for DecidimApp config * Add DecidimApp Rack Attack specs * Remove spec file * Add rack attack throttling specs * Add specs for Fail2ban * Revert changes in db/schema.rb * Fix not interpreted error * Remove trusted proxies configuration * Remove trusted proxies configuration # Conflicts: # config/initializers/decidim.rb # config/initializers/rack_attack.rb # spec/lib/decidim_app/rack_attack/fail2ban_spec.rb # spec/lib/decidim_app/rack_attack_spec.rb * Improves coverage (#330) # Conflicts: # spec/lib/decidim_app/rack_attack/fail2ban_spec.rb * Make task idempotent (#336) Co-authored-by: Quentin Champenois <[email protected]> # Conflicts: # lib/decidim/admin_creator.rb # lib/decidim/system_admin_creator.rb * Add upgrade rake task (#337) * Add upgrade task * Add task * Add pull request trigger (#342) * Move to K8s namespace # Conflicts: # lib/k8s_configuration_exporter.rb # lib/k8s_organization_exporter.rb # lib/tasks/decidim_app.rake # lib/tasks/k8s.rake # spec/lib/k8s/configuration_exporter_spec.rb # spec/lib/k8s/organization_exporter_spec.rb # spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb * Fix dump_db task * Fix dump path * Create organization, system admin and admin from YAML (#339) Co-authored-by: Quentin Champenois <[email protected]> Co-authored-by: quentinchampenois <[email protected]> # Conflicts: # lib/decidim_app/config.rb # lib/decidim_app/k8s/commands/organization.rb # lib/decidim_app/k8s/configuration.rb # lib/decidim_app/k8s/organization_exporter.rb # lib/decidim_app/rack_attack.rb # spec/fixtures/k8s_configuration_example.yml # spec/lib/decidim/admin_creator_spec.rb # spec/lib/decidim/system_admin_creator_spec.rb # spec/lib/decidim_app/k8s/commands/organization_spec.rb # spec/lib/decidim_app/k8s/configuration_spec.rb # spec/lib/decidim_app/k8s/organization_exporter_spec.rb # spec/lib/tasks/create_admin_task_spec.rb # spec/lib/tasks/create_system_admin_task_spec.rb # spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb # spec/lib/tasks/decidim_app/k8s/external_install_or_reload_task_spec.rb # spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb * Fix environment variables issue (#349) # Conflicts: # lib/decidim_app/k8s/organization_exporter.rb # spec/lib/decidim_app/k8s/organization_exporter_spec.rb * K8S - Check if secondary hosts are valid (#350) # Conflicts: # lib/decidim_app/k8s/secondary_hosts_checker.rb # spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb * Fix secondary hosts checker (#351) # Conflicts: # lib/decidim_app/k8s/secondary_hosts_checker.rb # spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb * K8S - Raise error if file does not exist (#353) # Conflicts: # spec/lib/tasks/decidim_app/k8s/external_install_or_reload_task_spec.rb * Add install hook (#352) * Use Rails cache instead of defining new one (#354) * Update organization_exporter.rb (#357) * Fix organization update (#356) Co-authored-by: Quentin Champenois <[email protected]> # Conflicts: # lib/decidim_app/k8s/commands/organization.rb # lib/decidim_app/k8s/configuration.rb # spec/fixtures/k8s_configuration_example.yml # spec/lib/decidim_app/k8s/commands/organization_spec.rb # spec/lib/decidim_app/k8s/configuration_spec.rb * Fix rack attack config (#358) # Conflicts: # lib/decidim_app/config.rb # lib/decidim_app/rack_attack.rb # spec/lib/decidim_app/rack_attack_spec.rb * Cleanup rake tasks (#288) # Conflicts: # app/services/decidim/repair_nickname_service.rb # lib/tasks/restore_dump.rake # spec/services/decidim/repair_nickname_service_spec.rb * Replace HTTPS tests with HTTP (#359) Co-authored-by: Armand Fardeau <[email protected]> * Fix invalid users (#361) # Conflicts: # app/services/decidim/repair_nickname_service.rb # spec/services/decidim/repair_nickname_service_spec.rb * Fix export when smtp settings are nil (#362) * Revert "Add pull request trigger (#342)" This reverts commit b4eb3f0. * Fix offenses * Fix sidekiq * fix: Delete useless files * Fix checks * Fix locales * Downgrade chromedriver * Remimport rack-attack * Fix tasks tests * Fix test * Reintroduce sms service * Fix locales * fix: Change phone authorization remote branch * fix: Revert awesome version from 0.9.x to 0.8.3 * fix: create registration spec default locale * fix: Remove es locale from spec * fix: Remove es locale from spec * fix: Remove es locale from spec * fix: Remove es ca from locales in CI * lint: Normalize fr keys * fix: Add missing fr keys * lint: Fix rubocop offense in spec * fix: Lock decidim_awesome to 0.8.3 * fix: Update dependencies * fix: K8S export rake configuration * Fix related processes display (#144) --------- Co-authored-by: Pierre Ozoux <[email protected]> Co-authored-by: Quentin Champenois <[email protected]> Co-authored-by: moustachu <[email protected]> Co-authored-by: quentinchampenois <[email protected]> Co-authored-by: Pauline Bessoles <[email protected]>
moustachu
requested review from
Quentinchampenois,
paulinebessoles and
a team
paulinebessoles
approved these changes
Sep 7, 2023
Quentinchampenois
approved these changes
Sep 7, 2023
|
Waiting CI to be green before merge |
Quentinchampenois
added a commit
that referenced
this pull request
Feb 20, 2024
* Bump ruby, node version and dependencies * Remove not needed initializers * Upgrade Decidim * Migrate database * Reinstall webpacker * Update js dependencies * Support multiple platforms for bundler * Remove proposal cell override * Remove not needed override verifications authorize user * Move overrides to extend for meetings controller * Remove not needed override pp controller * Update proposals controller * Remove verif controller override * Remove deprecated events override * Remove deprecated model proposal override * Remove deprecated queries PP override * Remove deprecated meetings serializer override * Fix undefined Decidim::Devise.setup method * Update views layouts wrapper * Fix undefined 'favicon' method from LayoutHelper * Remove not needed scopes picker from PR '#56' * Remove unnecessary user answers serializer override * Remove unnecessary decidim test promoted pp override * Update i18n specs and remove awesome module * Add omniauth publik * Fix rubocop offenses * Remove unnecessary meetings system specs * Update authentication specs * Update account system specs * Update specs for homepage * Remove not needed specs * Exclude 'bin' folder in rubocop rules * Fix rubocop offenses * Exclude 'bin' directory in rubocop * Update view layout main_footer * Add france connect omniauth strategy * Add decidim awesome * [Github Actions] - Fix Rspec CI and rules (#124) * Update GH workflows * Update GH Actions rules * Fix rubocop offense * Fix undefined method blocked for admins (#120) * Add spam detection * Add term custo and phone AH gems (#149) Co-authored-by: armandfardeau <[email protected]> * Add friendly sign up (#145) * Add friendly sign up * Fix offenses * Do migrate * Update tests * Add exports to queues * Fix rack attack * Move logging to suscriber * Add missing queue * Fix 0.26 release branch (#152) * Add decidim conferences (#156) * Rack Attack - Throttle 100 requests / minute (#157) * Throttle 10requests / second * Update rack attack rules * Fix rails logger * Resolve conflicts between 0.26 and develop * Bump 0.26 version to make it compatible with develop branch * Update packages * Fix tests * Add Gemfile lock and platforms support * Add JS dependencies * Upgrade Decidim js dependencies * Add missing js dependencies * Remove unnecessary seeds * add leaflet markercluster Co-authored-by: quentinchampenois <[email protected]> Co-authored-by: Armand Fardeau <[email protected]> Co-authored-by: armandfardeau <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.