-
Notifications
You must be signed in to change notification settings - Fork 5
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
Deployment #334
Merged
Deployment #334
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
The version constraint on `channels` is due to a bug that was fixed in 2.3.0 (see django/channels#1240).
This is from the change in Django 3.1 where `User.first_name`'s `max_length` is increased from 30 to 150, which we need to add our own migration for - because we're using a custom user model that inherits from Django's user model.
Modifying the existing migration is fine in this case, as the `blank` argument doesn't alter the database in any way - it's only used by forms.
Also prevented unnecessarily saving when no fields needed updating.
Update requirements
Also added an EquipmentQuerySet manager to Equipment, with a `default_order_by()` method.
Reordered the fields in the Equipment model to avoid having to manually set the field order in EquipmentForm. Also added ordering by priority (and title) in EquipmentListView and AdminEquipmentView.
Add equipment priority
Configure logging and add logging where appropriate
# Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
Don't update user's name if it's been changed after account creation
Copy Participants Emails
Also changed date from datefield to datetimefield and renamed permissions.
Run apt update before installing system dependencies
Use timezone aware datetimes in announcements
# Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
Feature/secrets
# Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
Updated about page and email list
Codecov Report
@@ Coverage Diff @@
## master #334 +/- ##
==========================================
+ Coverage 70.55% 72.05% +1.49%
==========================================
Files 102 103 +1
Lines 3254 3357 +103
==========================================
+ Hits 2296 2419 +123
+ Misses 958 938 -20
Continue to review full report at Codecov.
|
ddabble
approved these changes
Nov 20, 2020
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.
This PR includes changes from
#331 Run apt update before installing system dependencies
#330 Feature/secrets
#329 Use timezone aware datetimes in announcements
#326 Copy Participants Emails
#325 Updated about page and email list
#322 Add equipment priority
#321 Configure logging and add logging where appropriate
#320 Don't update user's name if it's been changed after account creation
#319 Update requirements