Merge branch 'next' into pr/AntonLukichev/21480

mui · Jun 17, 2020 · 96b6100 · 96b6100
2 parents d284872 + 9e2cbae
commit 96b6100
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/docs/src/pages/components/tables/tables.md b/docs/src/pages/components/tables/tables.md
@@ -66,7 +66,13 @@ You should either provide an array of:
 - **objects**, the `value` and `label` keys will be used respectively for the value and label of the option (useful for language strings such as 'All').
 
   ```jsx
-  <TablePagination rowsPerPageOptions={[10, 50, { value: -1, label: 'All' }]} />
+  <TablePagination
+    rowsPerPageOptions={[
+      10,
+      50,
+      { value: -1, label: 'All' },
+    ]}
+  />
   ```
 
 ### Custom pagination actions

diff --git a/scripts/listChangedFiles.js b/scripts/listChangedFiles.js
@@ -24,7 +24,7 @@ async function execGitCmd(args) {
 }
 
 async function listChangedFiles() {
-  const comparedBranch = process.env.CIRCLECI ? 'origin/master' : 'master';
+  const comparedBranch = process.env.CIRCLECI ? 'origin/next' : 'next';
   const mergeBase = await execGitCmd(['rev-parse', comparedBranch]);
   const gitDiff = await execGitCmd(['diff', '--name-only', mergeBase]);
   const gitLs = await execGitCmd(['ls-files', '--others', '--exclude-standard']);