Skip to content

Commit

Permalink
Merge pull request #7364 from opengovsg/release-al2
Browse files Browse the repository at this point in the history
build: merge release back to develop
  • Loading branch information
KenLSM authored Jun 5, 2024
2 parents f0bba16 + 6a4872a commit 61c7985
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,28 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v6.123.0](https://github.com/opengovsg/FormSG/compare/v6.123.0...v6.123.0)

- revert: "feat: allow wildcard domains for domain-restricted email fields" [`#7363`](https://github.com/opengovsg/FormSG/pull/7363)

#### [v6.123.0](https://github.com/opengovsg/FormSG/compare/v6.122.0...v6.123.0)

> 5 June 2024

- fix(deps): bump type-fest from 4.18.3 to 4.19.0 in /shared [`#7361`](https://github.com/opengovsg/FormSG/pull/7361)
- chore(payments): remove payment flags checks from payment controller [`#7354`](https://github.com/opengovsg/FormSG/pull/7354)
- chore(deps-dev): bump prettier from 3.2.5 to 3.3.0 in /shared [`#7357`](https://github.com/opengovsg/FormSG/pull/7357)
- fix(husky): add execution permission to .husky files [`#7356`](https://github.com/opengovsg/FormSG/pull/7356)
- feat: allow wildcard domains for domain-restricted email fields [`#7086`](https://github.com/opengovsg/FormSG/pull/7086)
- feat: replace secrets-check with git-secrets [`#7353`](https://github.com/opengovsg/FormSG/pull/7353)
- build: merge release v6.122.0 into develop [`#7352`](https://github.com/opengovsg/FormSG/pull/7352)
- build: release v6.122.0 [`#7351`](https://github.com/opengovsg/FormSG/pull/7351)
- chore: bump version to v6.123.0 [`314a4af`](https://github.com/opengovsg/FormSG/commit/314a4af772730e4d0196c1a53422c44f3d1421af)

#### [v6.122.0](https://github.com/opengovsg/FormSG/compare/v6.121.0...v6.122.0)

> 29 May 2024

- docs(onboarding): touch up onboarding docs, update nvmrc [`#7348`](https://github.com/opengovsg/FormSG/pull/7348)
- chore: regenerate correct package-lock [`#7349`](https://github.com/opengovsg/FormSG/pull/7349)
- fix(deps): bump libphonenumber-js from 1.11.1 to 1.11.2 in /shared [`#7347`](https://github.com/opengovsg/FormSG/pull/7347)
Expand All @@ -25,6 +45,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix: storybook folder to use base dir [`#7328`](https://github.com/opengovsg/FormSG/pull/7328)
- build: merge v6.121.0 into develop [`#7327`](https://github.com/opengovsg/FormSG/pull/7327)
- build: release v6.121.0 [`#7326`](https://github.com/opengovsg/FormSG/pull/7326)
- chore: bump version to v6.122.0 [`d48e974`](https://github.com/opengovsg/FormSG/commit/d48e974189cc565c02df2955811dbb2402753d26)

#### [v6.121.0](https://github.com/opengovsg/FormSG/compare/v6.120.0...v6.121.0)

Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "form-frontend",
"version": "6.122.0",
"version": "6.123.0",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "6.122.0",
"version": "6.123.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down

0 comments on commit 61c7985

Please sign in to comment.