alan-turing-institute / data-safe-haven

https://data-safe-haven.readthedocs.io
BSD 3-Clause "New" or "Revised" License
61 stars 15 forks source link

Merge v4.2.2 from 'latest' into 'release-v5.0.0' #2109

Closed jemrobinson closed 3 months ago

jemrobinson commented 3 months ago

:white_check_mark: Checklist

:vertical_traffic_light: Depends on

n/a

:arrow_heading_up: Summary

Merge changes to ensure that develop can be cleanly merged into latest when required.

:closed_umbrella: Related issues

n/a

:microscope: Tests

n/a

JimMadge commented 3 months ago

I changed the target branch to the release branch.

jemrobinson commented 3 months ago

@JimMadge : sure - although really this should have been done into develop immediately after we released v4.2.2.

github-actions[bot] commented 3 months ago

Coverage report

This PR does not seem to contain any modification to coverable code.

JimMadge commented 3 months ago

Probably. I think the branches have diverged enough now that the merge will probably be mostly to discard changes from 4.2.2.

jemrobinson commented 3 months ago

Yes, it is - although with changes to docs it was worth manually checking that the same changes had made it into the v5 docs too.

jemrobinson commented 3 months ago

39 commits to make 0 changes to files :)