merge: Sync master and develop #56
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
Add interactive map module, migrations & prep IH (#37)
* 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 # lib/tasks/test.rake
# Conflicts: # config/application.rb # lib/tasks/k8s.rake # lib/tasks/migrate.rake # lib/tasks/scaleway.rake
Co-authored-by: Armand Fardeau <[email protected]> # Conflicts: # config/secrets.yml # config/storage.yml
* 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
# Conflicts: # lib/initializers/sentry_setup.rb # spec/lib/sentry_setup_spec.rb
Co-authored-by: Quentin Champenois <[email protected]>
* Add upgrade task * Add task
# Conflicts: # .github/workflows/ci_cd.yml
# 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
# Conflicts: # docker-compose.yml
Co-authored-by: Quentin Champenois <[email protected]> Co-authored-by: quentinchampenois <[email protected]> # Conflicts: # 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
Co-authored-by: Quentin Champenois <[email protected]>
# Conflicts: # spec/system/confirmation_spec.rb
# Conflicts: # lib/tasks/repair_data.rake # lib/tasks/restore_dump.rake
Co-authored-by: Armand Fardeau <[email protected]>
# Conflicts: # config/environments/production.rb
Co-authored-by: Armand Fardeau <[email protected]> Co-authored-by: Quentin Champenois <[email protected]> Co-authored-by: quentinchampenois <[email protected]> Co-authored-by: Pierre Ozoux <[email protected]> Co-authored-by: moustachu <[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.
🎩 Description
Please describe your pull request.
Synchronize branches
📌 Related Issues
Link your PR to an issue
Testing
Describe the best way to test or validate your PR.
Example:
Tasks
📷 Screenshots
Please add screenshots of the changes you're proposing if related to the UI