Merge pull request #2250 from Automattic/alpha

Release Feb 20

.circleci/config.yml

@@ -75,6 +75,7 @@ workflows:
                 - release
                 - alpha
                 - /^hotfix\/.*/
+                - /^epic\/.*/
       - post_release:
           requires:
             - release

.github/CONTRIBUTING.md

@@ -29,7 +29,7 @@ Feature requests can be [submitted to our issue tracker](https://github.com/Auto
 
 ## Pull requests
 
-To submit a patch to the Newspack theme, simply create a pull request to the master branch of the Newspack theme repository. Please test and provide an explanation for your changes. When opening a pull request, please follow these guidelines:
+To submit a patch to the Newspack theme, simply create a pull request to the trunk branch of the Newspack theme repository. Please test and provide an explanation for your changes. When opening a pull request, please follow these guidelines:
 
 - **Ensure you stick to the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/) and the [VIP Go Coding Standards](https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/)**
 - Install our pre-commit hook using composer. It'll help with the coding standards by automatically checking code when you commit. To install them run `composer install` from the command line within the Newspack plugin or theme directory.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### All Submissions:
 
-* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md)?
+* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-theme/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?
 

.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

CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.85.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v1.84.1...v1.85.0-alpha.1) (2024-02-08)
+
+
+### Bug Fixes
+
+* **my-account:** fixes for My Account ([#2240](https://github.com/Automattic/newspack-theme/issues/2240)) ([90f2b8f](https://github.com/Automattic/newspack-theme/commit/90f2b8f805c8de02e1b68cefe6dc1901d1051e18))
+
+
+### Features
+
+* **ci:** add epic/* release workflow and rename `master` to `trunk` ([#2225](https://github.com/Automattic/newspack-theme/issues/2225)) ([86e6ada](https://github.com/Automattic/newspack-theme/commit/86e6ada53147925df1bd50eac00dd00527995203))
+* simplify footer credits ([#2222](https://github.com/Automattic/newspack-theme/issues/2222)) ([01ef71d](https://github.com/Automattic/newspack-theme/commit/01ef71d020384062c5567e70fa5728eec599df0d))
+
 ## [1.84.1](https://github.com/Automattic/newspack-theme/compare/v1.84.0...v1.84.1) (2024-02-06)
 
 

README.md

@@ -16,7 +16,7 @@ To disclose a security issue to our team, [please submit a report via HackerOne
 
 ## Contributing to Newspack
 
-If you have a patch or have stumbled upon an issue with the Newspack plugin/theme, you can contribute this back to the code. [Please read our contributor guidelines for more information on how you can do this.](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md)
+If you have a patch or have stumbled upon an issue with the Newspack plugin/theme, you can contribute this back to the code. [Please read our contributor guidelines for more information on how you can do this.](https://github.com/Automattic/newspack-theme/blob/trunk/.github/CONTRIBUTING.md)
 
 ### Development
 
@@ -28,10 +28,10 @@ The Newspack theme repository contains the Newspack parent theme in a subdirecto
 
 ## Support or Questions
 
-This repository is not suitable for support or general questions about Newspack. Please only use our issue trackers for bug reports and feature requests, following [the contribution guidelines](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md).
+This repository is not suitable for support or general questions about Newspack. Please only use our issue trackers for bug reports and feature requests, following [the contribution guidelines](https://github.com/Automattic/newspack-theme/blob/trunk/.github/CONTRIBUTING.md).
 
 Support requests in issues on this repository will be closed on sight.
 
 ## License
 
-Newspack is licensed under [GNU General Public License v2 (or later)](https://github.com/Automattic/newspack-theme/blob/master/LICENSE).
+Newspack is licensed under [GNU General Public License v2 (or later)](https://github.com/Automattic/newspack-theme/blob/trunk/LICENSE).