From 9777c3c4a5892732226fd5bd6d05d184b278e664 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Dec 2019 11:41:21 +0000 Subject: [PATCH 1/3] Update dependency rollup to v1 --- components/x-follow-button/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/x-follow-button/package.json b/components/x-follow-button/package.json index a873b6f42..ff77c0435 100644 --- a/components/x-follow-button/package.json +++ b/components/x-follow-button/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@financial-times/x-rollup": "file:../../packages/x-rollup", "@financial-times/x-test-utils": "file:../../packages/x-test-utils", - "rollup": "^0.57.1", + "rollup": "^1.0.0", "bower": "^1.7.9", "node-sass": "^4.9.2" }, From 3af4d11fb9c84bf244870101bb5cf3745d7b4f57 Mon Sep 17 00:00:00 2001 From: Edd Sowden Date: Mon, 30 Dec 2019 16:31:41 +0000 Subject: [PATCH 2/3] Adding github settings.yml This lets us centrally define access permissions to our repositories and other sensible defaults where approrpriate. You can see the defaults in the [github-apps-config-next][defaults] repo. For full configuration options check out the [probot settings repo][probot]. [defaults]: https://github.com/Financial-Times/github-apps-config-next/blob/master/.github/settings.yml [probot]: https://github.com/probot/settings --- .github/settings.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/settings.yml diff --git a/.github/settings.yml b/.github/settings.yml new file mode 100644 index 000000000..a1f30bc26 --- /dev/null +++ b/.github/settings.yml @@ -0,0 +1,17 @@ +_extends: github-apps-config-next + +branches: + - name: master + protection: + required_pull_request_reviews: + required_approving_review_count: 1 + dismiss_stale_reviews: true + require_code_owner_reviews: false + required_status_checks: + strict: true + contexts: + - "ci/circleci: test" + enforce_admins: false + restrictions: + users: [] + teams: [] From be70aeea61c4fd8d38f43a138c600dbfd7b9528c Mon Sep 17 00:00:00 2001 From: Matt Hinchliffe Date: Mon, 6 Jan 2020 12:05:31 +0000 Subject: [PATCH 3/3] Remove rollup dependency from x-follow-button component --- components/x-follow-button/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/components/x-follow-button/package.json b/components/x-follow-button/package.json index ff77c0435..78abb478d 100644 --- a/components/x-follow-button/package.json +++ b/components/x-follow-button/package.json @@ -17,7 +17,6 @@ "devDependencies": { "@financial-times/x-rollup": "file:../../packages/x-rollup", "@financial-times/x-test-utils": "file:../../packages/x-test-utils", - "rollup": "^1.0.0", "bower": "^1.7.9", "node-sass": "^4.9.2" },