Skip to content

Release 2025.4.1#459

Merged
MarcelGeo merged 26 commits intomasterfrom
develop
Jun 2, 2025
Merged

Release 2025.4.1#459
MarcelGeo merged 26 commits intomasterfrom
develop

Conversation

@MarcelGeo
Copy link
Collaborator

@MarcelGeo MarcelGeo commented May 29, 2025

No description provided.

MarcelGeo and others added 24 commits May 7, 2025 17:03
@MarcelGeo
Cleanup of permission utils from un neccessary objects
9e4c43d 
- remove 4113 from download apis
@MarcelGeo
Merge pull request #449 from MerginMaps/master
34fcd74 
Backport master -> develop
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into cleanup-refactor-p…
eec6710 
…ermissions-apis
@MarcelGeo
Hide receive notifications for can_edit_profile users false
e683272
@MarcelGeo
Initial version for diagnostic logs:
5ba12b0 
- add new v2 endpoint to stats module
- save file to DIAGNOSTIC_LOGS_URL
- propagate to config
@MarcelGeo
fix config getting
0079a0b
@MarcelGeo
small variable change
58ffbde
@MarcelGeo
bump 2025.4.1
c6b3c24
@MarcelGeo
Some text to run tests
784f7c5
@MarcelGeo
Merge pull request #450 from MerginMaps/cleanup-refactor-permissions-…
909eee1 
…apis

Cleanup of permission utils from un neccessary objects
@MarcelGeo
add back 413
e4b29f6
@MarcelGeo
Remove 413
ec75688
@MarcelGeo
change test
c1f9133
@MarcelGeo
just trying 413 replced by 422 (as it's real)
d83e4a5
@MarcelGeo
Refactor:
4c5b6e2 
- move some endpoints to global app.py from stats
- move some tests to `test_controller`
Updated:
- make max size configurable
@MarcelGeo
Merge pull request #454 from MerginMaps/make_tests_working
e8885d5 
Make tests working
@MarcelGeo
Merge pull request #453 from MerginMaps/bump_2025.4.1
8854e23 
bump 2025.4.1
@MarcelGeo
Added diagnostic logs to deployment
5c295e7
@MarcelGeo
Merge pull request #452 from MerginMaps/diagnostic-logs-endpoint
9f864ba 
Initial version for diagnostic logs:
@harminius
check_password method can handle epmty password field
5cc2883
@harminius
Do not use abort in models
ab79d97
@harminius
Make test closer to real behaviour
a99bc7a
@harminius
revert back
0136d12
@MarcelGeo
Merge pull request #456 from MerginMaps/fix_login_without_pwd
290c688 
Fix login using password for SSO users
@MarcelGeo MarcelGeo requested review from harminius and varmar05 May 29, 2025 07:37
@MarcelGeo MarcelGeo merged commit 4aae3f1 into master Jun 2, 2025
4 checks passed
@coveralls
Copy link

coveralls commented Jun 3, 2025

Pull Request Test Coverage Report for Build 15386375613

Details

  • 189 of 194 (97.42%) changed or added relevant lines in 13 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.1%) to 91.743%
Changes Missing Coverage Covered Lines Changed/Added Lines %
server/mergin/controller.py 38 43 88.37%
Totals Coverage Status
Change from base Build 14989844321: 0.1%
Covered Lines: 7078
Relevant Lines: 7715
💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@harminius harminius harminius approved these changes

@varmar05 varmar05 Awaiting requested review from varmar05

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MarcelGeo @coveralls @harminius