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.

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

chore(merge): iterations - merge main into main-iterations #2924

Merged
merged 122 commits into from
Aug 8, 2024

Conversation

ttbarnes
Copy link
Contributor

@ttbarnes ttbarnes commented Aug 8, 2024

Introduction ✏️

  • The main branch has had a lot of updates since the main-iterations branch was created.

Resolution ✔️

  • Merge main into main-iterations.

Zainzzkk and others added 30 commits July 11, 2024 14:32
Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk>
* chore(main): release 2.10.0

* chore(cspell): fix typos

---------

Co-authored-by: ttbarnes <tony@tonybarnes.me>
* fix(EMS-3560): update az cli to v2

* fix(EMS-3560): update az cli to v2

* fix(durable-functions): updated szenius/set-timezone GHA plugin to v2

* fix(durable-functions): updated szenius/set-timezone GHA plugin to v2

---------

Co-authored-by: Abhi Markan <amarkan@ukexportfinance.gov.uk>
Co-authored-by: ttbarnes <tony@tonybarnes.me>
* feat(EMS-3502-3567-3568): content updates - contact us

* feat(EMS-3502-3567-3568): content updates - email links

* feat(EMS-3502-3567-3568): content updates - email links

* feat(EMS-3502-3567-3568): content updates - email links

* feat(EMS-3502-3567-3568): dry cypress selectors

* feat(EMS-3502-3567-3568): dry cypress selectors

* feat(EMS-3502-3567-3568): content updates - email links

* feat(EMS-3502-3567-3568): revert content string change
* fix(EMS-3590): update insurance header link

* fix(EMS-3591-3423): update integrity hashes

* chore(EMS-3533): update start url redirect

* fix(EMS-3533): revert start page redirect

* chore(e2e): dry route const
* feat(EMS-3587): contact page - content iterations

* chore(EMS-3587): remove commented code

* fix(EMS-3425): password reset - update label text

* fix(EMS-3425): password reset - update label text
…y-vault-cost-alerts

feat(EMS-2186): added key vault
* chore(mysql-version): downgraded to 8.0.21

* chore(mysql-version): added to cspell

* chore(mysql-version): bumped dependency

* chore(mysql-version): downgrade to 8.0

* chore(mysql-version): bump deps

* chore(mysql-version): bump deps

---------

Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk>
@ttbarnes ttbarnes merged commit 2dc2bb3 into main-iterations Aug 8, 2024
177 checks passed
@ttbarnes ttbarnes deleted the chore/mergeMain branch August 8, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Chore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants