added 4 commits <ul><li>f9bb1c78 - Add reference_object to get_single_events pipeline</li><li>7ce009ee - Fix variable names for reference object</li><li>5cf265bc - Allow manual setting of queryset when generating calendar feeds</li><li>584c4ce7 - Merge branch...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1398/diffs?diff_id=38242&start_sha=6c0af9e4e78113ac6140b28eb7d031b2ab882016)

yuha commented

2024-01-21 17:09:32 +01:00

Author

Member

added 1 commit

9c13beed - Add default value for queryset argument in create_feed

Compare with previous version

added 1 commit <ul><li>9c13beed - Add default value for queryset argument in create_feed</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1398/diffs?diff_id=38255&start_sha=584c4ce7ca16cf815160cc6610a955e3fd77712a)

This pull request has changes conflicting with the target branch.

.gitignore
aleksis/core/mixins.py

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Draft: Resolve "Allow setting of custom queryset when creating calendar feeds"' (#3043) from 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds into master

Merge commit body

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/3043

Merge pull request 'WIP: Draft: Resolve "Allow setting of custom queryset when creating calendar feeds"' (#3043) from 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds into master

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/3043

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds:966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

git switch 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

git switch 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

git rebase master

git switch master

git merge --ff-only 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

git switch 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

git rebase master

git switch master

git merge --no-ff 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds

git switch master

git merge --squash 966-allow-setting-of-custom-queryset-when-creating-calendar-feeds