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.

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

Merge develop to master #11

Merged
merged 32 commits into from
Nov 29, 2021
Merged

Merge develop to master #11

merged 32 commits into from
Nov 29, 2021

Conversation

MoretS
Copy link
Contributor

@MoretS MoretS commented Nov 4, 2021

  • Bump 0.24
  • Backport fix/user_answers_serializer

MoretS and others added 28 commits October 28, 2021 21:37
* Add specs for user answers serializer

* Backport lib user_answers_serializer

* Fix meetings registration serializer

* Generate Overrides md file
…ers_serializer

Backport fix/user answers serializer
* Add previously removed job

* Rescue error on deepl translator

* Fix rubocop offenses
@paulinebessoles
Copy link
Contributor

paulinebessoles commented Nov 10, 2021

This PR is ready for delivery.

* Delete meetings_controller

* Update Overload file

* Remove unused keys

* Add updated overloads

* Update overloads

* Remove unused and missing keys

* Add meetings indexes tests

* Update translations
armandfardeau and others added 3 commits November 23, 2021 17:57
* Add integrity and defer to assets

* Remove defer attributes

* Fix empty line

Co-authored-by: moustachu <[email protected]>
Copy link
Member

@moustachu moustachu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@paulinebessoles paulinebessoles merged commit e76e0fe into master Nov 29, 2021
Quentinchampenois added a commit that referenced this pull request Mar 10, 2022
* Bump to 0.24

* Fix tests

* Fix ruby version in tests

* Linting files

* Backport fix/user answers serializer (#11)

* Add specs for user answers serializer

* Backport lib user_answers_serializer

* Fix meetings registration serializer

* Generate Overrides md file

* Fix application db initialization

* Linting files

* Fix application db initialization

* Delete unused overload

* Fix tests

* Lint code and update tests

* Fix failing tests

* Fix conflicts and fix job specs

* Add machine translation job

* Remove decidim-cookies config

* Remove .rspec-failures file

* Linting files

* add backup tasks + new job scheduling

* fix rubocop offenses

* fix rubocop offenses

* fix rubocop offenses

* Add logs on Deepl translation (#13)

* Add previously removed job

* Rescue error on deepl translator

* Fix rubocop offenses

* Update meetings order overloads (#15)

* Delete meetings_controller

* Update Overload file

* Remove unused keys

* Add updated overloads

* Update overloads

* Remove unused and missing keys

* Add meetings indexes tests

* Update translations

* Add integrity and defer to assets (#14)

* Add integrity and defer to assets

* Remove defer attributes

* Fix empty line

Co-authored-by: moustachu <[email protected]>

* Update asset host

* Add and fix broken factory

* Update database.yml

* Update carrierwave.rb

* Update secrets.yml

* Update sidekiq.yml

* Update http headers (#16)

* Update HTTP Headers

* Fix rubocop offenses

* Backport fix geocoded proposals and permissions (#17)

* Add proposals controller specs

* Add proposal controller

* Fix geocoding and permissions

* ignore missing keys

* Fix rubocop offenses

* Add overloads

Co-authored-by: MoretS <[email protected]>
Co-authored-by: quentinchampenois <[email protected]>
Co-authored-by: moustachu <[email protected]>
Co-authored-by: Sébastien Moret <[email protected]>
Co-authored-by: Armand Fardeau <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants