added 2 commits <ul><li>1897bf82 - fix(auth): Refactor htpasswd loading</li><li>9c66e6b0 - fix(view): forwarding data to views</li></ul> [Compare with previous version](/hazaar/framework/-/merge_requests/235/diffs?diff_id=6149&start_sha=04ea1f62a32f73081cdb859491d42af6d630c349)

jamie commented

2025-08-21 09:10:43 +00:00

(Migrated from git.hazaar.io)

added 12 commits

9c66e6b0...26e7f0a6 - 11 commits from branch master
066b96c5 - Merge branch 'master' into 297-feature-router-security

Compare with previous version

added 12 commits <ul><li>9c66e6b0...26e7f0a6 - 11 commits from branch <code>master</code></li><li>066b96c5 - Merge branch 'master' into 297-feature-router-security</li></ul> [Compare with previous version](/hazaar/framework/-/merge_requests/235/diffs?diff_id=6216&start_sha=9c66e6b091bd2ec429009cde34db0808afe33dac)

jamie added 1 commit

2025-09-11 02:42:21 +00:00

Merge branch 'master' into 297-feature-router-security 81e9a9966d

jamie force-pushed 297-feature-router-security from 81e9a9966d to 066b96c5a1

2025-09-11 02:44:47 +00:00

Compare

This pull request is marked as a work in progress.

This branch is out-of-date with the base branch

View command line instructions

Checkout

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

git fetch -u origin 297-feature-router-security:297-feature-router-security

git switch 297-feature-router-security

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 297-feature-router-security

git switch 297-feature-router-security

git rebase master

git switch master

git merge --ff-only 297-feature-router-security

git switch 297-feature-router-security

git rebase master

git switch master

git merge --no-ff 297-feature-router-security

git switch master

git merge --squash 297-feature-router-security