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.

Sign up for GitHub

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

Jump to bottom

Fix enabling parental controls #796

Merged
merged 3 commits into from
Oct 23, 2023
Merged

Fix enabling parental controls #796

merged 3 commits into from
Oct 23, 2023

Conversation

hastarin
Copy link
Contributor

@hastarin hastarin commented Aug 6, 2023

…nt-type application/json is allowed` #795

Proposed Changes

Detailed in #795

Related Issues

(Github link to related issues or pull requests)

@sonarqubecloud
Copy link

sonarqubecloud bot commented Aug 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@hastarin
Copy link
Contributor Author

@frenck would you be able to check and merge this?

@frenck
Copy link
Owner

frenck commented Aug 29, 2023

Sorry I am traveling at this moment (and the upcoming weeks).

@hastarin
Copy link
Contributor Author

No worries enjoy the travel.

@github-actions
Copy link

There hasn't been any activity on this pull request recently. This pull request has been automatically marked as stale because of that and will be closed if no further activity occurs within 7 days. Thank you for your contributions.

@github-actions github-actions bot added the stale There has not been activity on this issue or PR for quite some time. label Sep 30, 2023
@hastarin
Copy link
Contributor Author

@frenck are you back from travelling to take a look at this?

@github-actions github-actions bot removed the stale There has not been activity on this issue or PR for quite some time. label Oct 1, 2023
@frenck frenck added the bugfix Inconsistencies or issues which will cause a problem for users or implementers. label Oct 20, 2023
@frenck frenck changed the title fix: Fixes Callling /control/parental/enable failing with `only conte… Fix enabling parental controls Oct 20, 2023
frenck
frenck requested changes Oct 20, 2023
View reviewed changes
Copy link
Owner

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both formatting CI & units tests are failing.

Please make sure CI passes.

../Frenck

@frenck frenck marked this pull request as draft October 20, 2023 18:12
@hastarin hastarin marked this pull request as ready for review October 20, 2023 21:43
frenck
frenck approved these changes Oct 21, 2023
View reviewed changes
Copy link
Owner

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @hastarin 👍

../Frenck

@codecov
Copy link

codecov bot commented Oct 21, 2023 •
edited
Loading

Codecov Report

Merging #796 (5f3087b) into main (539734e) will not change coverage.
Report is 2 commits behind head on main.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##              main      #796   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            9         9           
  Lines          296       296           
  Branches        25        25           
=========================================
  Hits           296       296
Files Coverage Δ
src/adguardhome/parental.py 100.00% <100.00%> (ø)

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@hastarin
Copy link
Contributor Author

@frenck Sorry I just noticed the failed check for pylint. Hopefully this fixes it but will have to wait for your approval to see the workflow run to be sure.

frenck
frenck approved these changes Oct 23, 2023
View reviewed changes
Copy link
Owner

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @hastarin 👍

@frenck frenck merged commit 4265513 into frenck:main Oct 23, 2023
52 checks passed
@frenck frenck mentioned this pull request Oct 23, 2023
Closed
@github-actions github-actions bot locked and limited conversation to collaborators Oct 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@frenck frenck frenck approved these changes

Assignees
No one assigned
Labels
bugfix Inconsistencies or issues which will cause a problem for users or implementers.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hastarin @frenck