Merge develop into next in Preperation for the Reverse!
#2746
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
Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
Co-authored-by: Jathan McCollum <jathan@gmail.com>
* update links * town crier Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
…, rename local docker-compose workflow images, etc. (#2715)
…hoiceFilter`. (#2717) - This addresses an issue that was fixed in #2665 that obviated the need to specify `lookup_expr="in"` when defining a `TreeNodeMultipleChoiceFilter` on a filterset but could result in a `ValidationError` in filtersets provided by plugins. - If `lookup_expr` is passed to `TreeNodeMultipleChoiceFilter` on a filterset, this argument is now ignored.
Fix Site latitude or longitude float error
* fixed NautobotUIViewSet BulkCreateView issue. * changelog * added unittesting for bulk import with a csv file * fix csv sniff to use , as delimiter instead of : sometimes * use try/except block to catch cannot determine delimiter exception Co-authored-by: Hanlin Miao <hanlinmiao@Hanlins-MBP-2.home>
* Fix #2684 - add 'q' to ContentTypeFilterSet * Fix test on postgres
… on null value (#2714) * implement NullableDateField to enable CustomeField.TypeDate to filter on null value * changelog Co-authored-by: Hanlin Miao <hanlinmiao@Hanlins-MBP-2.home>
* Update site_url for mkdocs * Towncrier
* Update plugin development documentation for NautobotUIViewSet * Added changelog file with description
#2685) * Added Watchmedo command to worker container to allow container to restart on file change. * Regenerate poetry.lock with '--no-update' Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com> Co-authored-by: Bryan Culver <bryan.culver@networktocode.com>
…de is not set to tagged (#2688) Co-authored-by: Gary Snider <75227981+gsnider2195@users.noreply.github.com> Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
Release v1.4.9
Main to Develop Post v1.4.9
glennmatthews
approved these changes
Nov 4, 2022
bryanculver
force-pushed
the
bsc-merge-develop-into-next
branch
from
90cc47d
to
e362880
Compare
bryanculver
changed the title
develop into next in Preperation for the Reverse!develop into next in Preperation for the Reverse!
|
Faulty/flaky changelog fragment failure but not required for this PR: https://github.com/nautobot/nautobot/actions/runs/3397042333/jobs/5648778291 |
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.
What it says in the title.
Need this to address merge conflicts.
TODO