Merge pull request #434 from Automattic/trunk

Alpha release Feb 08

.circleci/config.yml

@@ -21,7 +21,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - trunk
       - newspack/release:
           requires:
             - newspack/build
@@ -31,6 +31,7 @@ workflows:
                 - release
                 - alpha
                 - /^hotfix\/.*/
+                - /^epic\/.*/
       - newspack/post-release:
           requires:
             - newspack/release

.hooks/pre-push

@@ -2,7 +2,7 @@
 
 branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
 
-if [[ "$branch" = "master" ]]; then
-    echo "Error: pushing directly to the master branch is prohibited"
+if [[ "$branch" = "trunk" ]]; then
+    echo "Error: pushing directly to the trunk branch is prohibited"
     exit 1
 fi

PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### All Submissions:
 
-* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-plugin/blob/master/.github/CONTRIBUTING.md)?
+* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-plugin/blob/trunk/.github/CONTRIBUTING.md)?
 * [ ] Does your code follow the [WordPress' coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/) and [VIP Go coding standards](https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/)?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?
 

README.md

@@ -1,6 +1,6 @@
 # newspack-listings
 
-[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![newspack-listings](https://circleci.com/gh/Automattic/newspack-listings/tree/master.svg?style=shield)](https://circleci.com/gh/Automattic/newspack-listings)
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![newspack-listings](https://circleci.com/gh/Automattic/newspack-listings/tree/trunk.svg?style=shield)](https://circleci.com/gh/Automattic/newspack-listings)
 
 Create reusable content as listings and add them to lists wherever core blocks can be used. Create static, curated lists or dynamic, auto-updating lists with optional "load more" functionality. Edit display options to control how the list looks and behaves for readers. Compatible with [AMP](https://amp.dev/).
 

includes/importer/README.md

@@ -10,7 +10,7 @@ The importer script requires a config file that describes the CSV data and how i
 * `NEWSPACK_LISTINGS_IMPORT_SEPARATOR` - (Required) This should be a string that defines what character (or set of characters) is used by the CSV file to separate multiple values that exist under a single column. For example, categories might be grouped under a single CSV column separated by a `;`.
 * `NEWSPACK_LISTINGS_IMPORT_DEFAULT_POST_TYPE` - (Optional) This lets you set the Newspack Listings post type the importer will default to if it can't determine what post type a CSV row should be imported as. If not defined, the importer will default to importing unknown data as generic listings.
 
-[A sample config file](https://github.com/Automattic/newspack-listings/tree/master/includes/importer/config-sample.php) is included in this repo for reference. For field mapping, only the keys present in this sample config will be used by the importer.
+[A sample config file](https://github.com/Automattic/newspack-listings/tree/trunk/includes/importer/config-sample.php) is included in this repo for reference. For field mapping, only the keys present in this sample config will be used by the importer.
 
 ## Usage