Skip to content

Commit

Permalink
Merge branch 'master' into fix-podcast-launcher-responsive-behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
alicebartlett authored Jan 22, 2020
2 parents f6ca328 + 0988065 commit e52fa24
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
17 changes: 17 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -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: []
1 change: 0 additions & 1 deletion components/x-follow-button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"devDependencies": {
"@financial-times/x-rollup": "file:../../packages/x-rollup",
"@financial-times/x-test-utils": "file:../../packages/x-test-utils",
"rollup": "^0.57.1",
"bower": "^1.7.9",
"node-sass": "^4.9.2"
},
Expand Down

0 comments on commit e52fa24

Please sign in to comment.