Skip to content
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

Test merge #172

Merged
merged 63 commits into from
Feb 7, 2024
Merged

Test merge #172

merged 63 commits into from
Feb 7, 2024

Conversation

matmair
Copy link
Owner

@matmair matmair commented Feb 7, 2024

No description provided.

SchrodingersGat and others added 30 commits December 16, 2023 11:40
- Some provided options were not correct
- `/api/plugins/activate` routed to PluginActivate view
- Must be associated with a specific plugin ID
…-api-docs

# Conflicts:
#	InvenTree/InvenTree/api.py
#	InvenTree/InvenTree/settings.py
#	InvenTree/common/api.py
#	InvenTree/plugin/api.py
#	InvenTree/stock/api.py
#	InvenTree/users/api.py
- Specify serializer
- Use RetrieveAPI class type
# Conflicts:
#	InvenTree/users/api.py
#	requirements.txt
* Mention the API version bump in CONTRIBUTION.md

* Update CONTRIBUTING.md

---------

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
he might be anonymously creating the schema ;-)
@matmair matmair marked this pull request as ready for review February 7, 2024 19:44
@matmair matmair merged commit 14f8f12 into master Feb 7, 2024
10 checks passed
@coveralls
Copy link

Pull Request Test Coverage Report for Build 7820304342

Warning: This coverage report may be inaccurate.

We've detected an issue with your CI configuration that might affect the accuracy of this pull request's coverage report.
To ensure accuracy in future PRs, please see these guidelines.
A quick fix for this PR: rebase it; your next report should be accurate.

  • -14 of 101 (86.14%) changed or added relevant lines in 19 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.02%) to 92.846%

Changes Missing Coverage Covered Lines Changed/Added Lines %
InvenTree/InvenTree/api_version.py 0 2 0.0%
InvenTree/users/serializers.py 1 13 7.69%
Files with Coverage Reduction New Missed Lines %
InvenTree/plugin/base/locate/api.py 1 97.44%
Totals Coverage Status
Change from base Build 7804146393: 0.02%
Covered Lines: 30211
Relevant Lines: 32539

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants