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

Merge hotfixes of main into dev #722

Merged
merged 8 commits into from
Dec 8, 2024
Merged

Merge hotfixes of main into dev #722

merged 8 commits into from
Dec 8, 2024

Conversation

Splines
Copy link
Member

@Splines Splines commented Dec 8, 2024

Here, we merge the hotfixes on the main branch back to dev.

Splines and others added 7 commits May 31, 2024 00:11
@Splines
Continuous Release 1.13.0
b84fcda 
Merge pull request #646 from MaMpf-HD/dev
@Splines
Continuous Release 1.14.0
ca2e126 
Merge pull request #661 from MaMpf-HD/dev
@Splines
Continuous Release 1.14.1
76c2676 
Merge pull request #679 from MaMpf-HD/dev
@fosterfarrell9
Set retry option to false for UserCleanerJob (#715)
46a3133
@Splines
Deal with registration edge cases in UserCleaner (#693) (#716)
2dc4bd6 
* Deal with registration edge cases in UserCleaner

* Replace `last_sign_in_at` by `current_sign_in_at`

* Simplify inactive_users method via usage of scopes

* Add another scope for recently active users
@Splines
Fix unknown user variable after deletion (#717)
ae4e982 
* Fix unknown user variable after deletion

* Adjust other occurrence of method

* Update failing user cleaner jobs with new method signature

* Expect user email for deletion mail

* Fix `with` syntax
@Splines
Merge remote-tracking branch 'origin' into merge/main-to-dev
399b77f
@Splines Splines self-assigned this Dec 8, 2024
@codecov Codecov
Copy link

codecov bot commented Dec 8, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (dev@1e19a40). Learn more about missing BASE report.

Additional details and impacted files 
@@          Coverage Diff           @@
##             dev     #722   +/-   ##
======================================
  Coverage       ?   54.28%           
======================================
  Files          ?      170           
  Lines          ?     7346           
  Branches       ?        0           
======================================
  Hits           ?     3988           
  Misses         ?     3358           
  Partials       ?        0

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Splines Splines merged commit bbe0833 into dev Dec 8, 2024
4 checks passed
@Splines Splines deleted the merge/main-to-dev branch December 8, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fosterfarrell9 fosterfarrell9 fosterfarrell9 approved these changes

Assignees

@Splines Splines

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Splines @fosterfarrell9