Skip to content

Commit

Permalink
Merge branch 'staging' into 'master'
Browse files Browse the repository at this point in the history
MEP

See merge request la-fabrique-numerique/biocarburants!283
  • Loading branch information
Yohann Ulreich committed Jan 13, 2025
2 parents e607d9b + 296d23a commit 6f40736
Show file tree
Hide file tree
Showing 208 changed files with 11,084 additions and 4,433 deletions.
3 changes: 2 additions & 1 deletion .buildpacks
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
https://github.com/Scalingo/apt-buildpack
https://github.com/Scalingo/nodejs-buildpack
https://github.com/Scalingo/python-buildpack
https://github.com/Scalingo/python-buildpack
https://github.com/yulreich/scalingo-buildpack-chrome-for-testing
4 changes: 1 addition & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ AWS_SECRET_ACCESS_KEY=
AWS_STORAGE_BUCKET_NAME=
AWS_S3_ENDPOINT_URL=
AWS_S3_REGION_NAME=
AWS_S3_USE_SSL=
SLACK_API_TOKEN=
AWS_DCDOCS_STORAGE_BUCKET_NAME=
AWS_ENV_FOLDER_NAME=

# emails
EMAIL_HOST=
Expand Down
2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ python-docx = "*"
django-filter = "*"
drf-spectacular = "*"
drf-nested-routers = "*"
undetected-chromedriver = "*"
setuptools = "*"
psutil = "*"

[dev-packages]
Expand Down
697 changes: 425 additions & 272 deletions Pipfile.lock

Large diffs are not rendered by default.

Loading

0 comments on commit 6f40736

Please sign in to comment.