From 6302ba9d9a1926cc71584e25ad77897d16e99d7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 06:51:16 +0000 Subject: [PATCH 1/4] Bump react-calendar from 3.2.1 to 3.3.0 Bumps [react-calendar](https://github.com/wojtekmaj/react-calendar) from 3.2.1 to 3.3.0. - [Release notes](https://github.com/wojtekmaj/react-calendar/releases) - [Commits](https://github.com/wojtekmaj/react-calendar/compare/v3.2.1...v3.3.0) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cf2649..254b8ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9953,9 +9953,9 @@ } }, "react-calendar": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-3.2.1.tgz", - "integrity": "sha512-nuS2o4FLGdVSNLniP3JatbYDSgp4hVRG2lWFmhx79qwm+XawmziF3aOjixCW6pxdBU36CagvGaGukKTfPfOOwg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-3.3.0.tgz", + "integrity": "sha512-Mdzchiidfch0Bfqg+7oQ938PRrHJKK9aMCDdfDmJ5+0qhmvonvaMn1mDHq9ppCpjdrqYXmnUW+7C6PhrhJ14ZQ==", "requires": { "@wojtekmaj/date-utils": "^1.0.2", "get-user-locale": "^1.2.0", diff --git a/package.json b/package.json index 7bf4e23..8177ecd 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "next-iron-session": "^4.1.10", "p-retry": "^4.2.0", "react": "^17.0.1", - "react-calendar": "^3.2.1", + "react-calendar": "^3.3.0", "react-dom": "^17.0.1", "ts-jest": "^26.4.4", "uuid": "^8.3.2" From b67dd37c6007954cee9e7f2117964249a670e0f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 06:48:18 +0000 Subject: [PATCH 2/4] Bump mongoose from 5.11.8 to 5.11.9 Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.11.8 to 5.11.9. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md) - [Commits](https://github.com/Automattic/mongoose/compare/5.11.8...5.11.9) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 254b8ad..d9db07a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7862,9 +7862,9 @@ } }, "mongoose": { - "version": "5.11.8", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.8.tgz", - "integrity": "sha512-RRfrYLg7pyuyx7xu5hwadjIZZJB9W2jqIMkL1CkTmk/uOCX3MX2tl4BVIi2rJUtgMNwn6dy3wBD3soB8I9Nlog==", + "version": "5.11.9", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.9.tgz", + "integrity": "sha512-lmG6R64jtGGxqtn88BkkY+v470LUfGgyTKUyjswQ5c01GNgQvxA0kQd8h+tm0hZb639hKNRxL9ZBQlLleUpuIQ==", "requires": { "@types/mongodb": "^3.5.27", "bson": "^1.1.4", diff --git a/package.json b/package.json index 8177ecd..7d2e871 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "date-fns": "^2.16.1", "date-fns-tz": "^1.0.12", "ics": "^2.26.2", - "mongoose": "^5.11.8", + "mongoose": "^5.11.9", "next": "^10.0.4", "next-iron-session": "^4.1.10", "p-retry": "^4.2.0", From a54cabc32924202e031292f013af66d587609d47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 06:49:46 +0000 Subject: [PATCH 3/4] Bump postcss from 8.2.1 to 8.2.2 Bumps [postcss](https://github.com/postcss/postcss) from 8.2.1 to 8.2.2. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.1...8.2.2) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9db07a..75640c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8668,9 +8668,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.1.tgz", - "integrity": "sha512-RhsqOOAQzTgh1UB/IZdca7F9WDb7SUCR2Vnv1x7DbvuuggQIpoDwjK+q0rzoPffhYvWNKX5JSwS4so4K3UC6vA==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.2.tgz", + "integrity": "sha512-HM1NDNWLgglJPQQMNwvLxgH2KcrKZklKLi/xXYIOaqQB57p/pDWEJNS83PVICYsn1Dg/9C26TiejNr422/ePaQ==", "dev": true, "requires": { "colorette": "^1.2.1", diff --git a/package.json b/package.json index 7d2e871..dd00152 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@types/react-calendar": "^3.1.2", "@types/uuid": "^8.3.0", "jest": "^26.6.3", - "postcss": "^8.2.1", + "postcss": "^8.2.2", "postcss-flexbugs-fixes": "^5.0.2", "postcss-preset-env": "^6.7.0", "swr": "^0.3.11", From 9ed4a287a167927ca1730b492c1e182646dc36fd Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 9 Jan 2021 23:07:02 +0100 Subject: [PATCH 4/4] add automerge of changes on master --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..9259763 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +name: Merge master changes to develop +on: + push: + branches: + - 'master' +jobs: + sync-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - name: Merge master -> develop + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: master + target_branch: develop + github_token: ${{ github.token }}