Skip to content

Commit

Permalink
Merge develop to master (#11)
Browse files Browse the repository at this point in the history
* 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

Co-authored-by: MoretS <[email protected]>
Co-authored-by: quentinchampenois <[email protected]>
Co-authored-by: moustachu <[email protected]>
Co-authored-by: paulinebessoles <[email protected]>
Co-authored-by: Pauline Bessoles <[email protected]>
Co-authored-by: Armand Fardeau <[email protected]>
  • Loading branch information
7 people authored Nov 29, 2021
1 parent 55d0d3a commit e76e0fe
Show file tree
Hide file tree
Showing 564 changed files with 4,506 additions and 1,678 deletions.
6 changes: 5 additions & 1 deletion .env-example
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ SECRET_KEY_BASE=
GEOCODER_LOOKUP_API_KEY=
SENTRY_DSN=
HELP_SCOUT_BEACON_ID_MAIN=

BACKUP_S3SYNC_ACCESS_KEY=
BACKUP_S3SYNC_SECRET_KEY=
BACKUP_S3SYNC_BUCKET=
BACKUP_S3SYNC_ENABLED=
BACKUP_S3RETENTION_ENABLED=
2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 2.6.6
RUBY_VERSION: 2.7.1

jobs:
lint:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ on:
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 2.6.6
RUBY_VERSION: 2.7.1
RUBYOPT: "-W0"

jobs:
tests:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ public/uploads
public/assets

.env

# Ignore git status file
git-status.txt
Loading

0 comments on commit e76e0fe

Please sign in to comment.