-
Notifications
You must be signed in to change notification settings - Fork 0
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
Fix commit history with upstream #12
Conversation
Add variables to enable task error notification emails
…able-option ordering variables while creating profile indicator
…d list according to profile selected
Tests for All details api enpoint and versions
Merging Staging to Master
…ange Profile indicator UI changes
Added validations to make sure user can only select version from valid list according to profile selected
…ange Profile indicator UI change
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.1.0 to 9.0.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@7.1.0...9.0.1) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Updated dataset admin form to fix various breaking conditions
Bumps [django-tinymce](https://github.com/jazzband/django-tinymce) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/jazzband/django-tinymce/releases) - [Changelog](https://github.com/jazzband/django-tinymce/blob/master/CHANGELOG.rst) - [Commits](jazzband/django-tinymce@3.3.0...3.4.0) --- updated-dependencies: - dependency-name: django-tinymce dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Merging Master into Staging
…ing into point-search-by-distance
Merging Staging into Master
…-2.2.3 Bump werkzeug from 2.0.2 to 2.2.3
Fixed bug in updating contentes via admin
Merging Staging into Master
…oints-download Feature/cache profile points download
…ging into staging
…imeout Added GUNICORN_TIMEOUT env variable to allow for configurable timeouts
Add retry and timeout config to Q_CLUSTER to prevent parellel jobs
…ync-with-upstream
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (but I don't have all the context).
docker-compose run --rm web python manage.py collectstatic --no-input | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it mean this is run "somewhere" else or why don't we need it documented?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is part of the local run configuration that I'll be re-documenting. As for now, we don't need to actually run this command as we don't have static resources really, so it works fine without it.
Essentially we're just updating the commit history so that we have all commits from upstream. The change in the |
Cool @DavidTheProgrammer , are we planning on re-adding it in another PR or does the app run fine without the |
... saw the "This is part of the local run configuration that I'll be re-documenting." comment so I'm assuming it's a separate PR. |
The app runs fine without the
No, it won't be re-added to the document in the other PR. But I will improve the README docs in that separate PR to reflect the current state of running it locally. |
Unlikely @DavidTheProgrammer , otherwise, there wouldn't have been a need of this pre-deploy script (that Dokku calls here). What's the equivalent in |
Maybe my memory is failing me but I don't think I ever ran a ...
command: >
bash -c "
python manage.py collectstatic --noinput
&& python manage.py runserver_plus 0.0.0.0:8000 --keep-meta-shutdown
" This works as expected. Other options include a custom startup script to execute as the command. |
Description
This commit is necessary only to sync the git histories of the two projects. The initial update appears to have used a rebase thus creating new commits via playback and not actually merging the branches. The initial fix from this branch did however carry over all the file changes and hence the tests from the first time around are still valid. The only file change is the
README.md
file with a removal of thecollectstatic
command.Related Issue
#4
How to test it locally
Check #5
Checklist
Pull Request
Commits
Code Quality
Testing