Merge branch 'develop' into trunk

10up · Aug 4, 2023 · a35c94a · a35c94a
2 parents 9b2a64f + e3be14a
commit a35c94a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 30 deletions.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -16,5 +16,9 @@ jobs:
     steps:
       - name: 'Checkout Repository'
         uses: actions/checkout@v3
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v1
+      - name: Dependency Review
+        uses: actions/dependency-review-action@v3
+        with:
+          license-check: true
+          vulnerability-check: false
+          config-file: 10up/.github/.github/dependency-review-config.yml@trunk
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
-## [1.3.2] - 2023-05-12
+## [1.3.2] - 2023-05-15
 
 ### Added
 - Run E2E tests on the zip generated by "Build release zip" action (props [@iamdharmesh](https://github.com/iamdharmesh), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#128](https://github.com/10up/publisher-media-kit/pull/128)).

diff --git a/assets/css/frontend/components/stats.css b/assets/css/frontend/components/stats.css
@@ -24,7 +24,7 @@ div.wp-block-group.pmk-stats {
 	}
 
 	& .wp-block-columns {
-		flex-wrap: wrap;
+		flex-wrap: wrap !important; /* !important to override columns style WP 6.0+ */
 
 		@media (--wp-medium-max) {
 			justify-content: center;

diff --git a/package-lock.json b/package-lock.json
diff --git a/readme.txt b/readme.txt
@@ -53,7 +53,7 @@ Click the block inserter (`+` button) in the top left of the block editor, click
 
 == Changelog ==
 
-= 1.3.2 = 2023-05-12
+= 1.3.2 = 2023-05-15
 * **Added:** Run E2E tests on the zip generated by "Build release zip" action (props [@iamdharmesh](https://github.com/iamdharmesh), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#128](https://github.com/10up/publisher-media-kit/pull/128)).
 * **Added:** GitHub Action Summary for Cypress e2e checks (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#129](https://github.com/10up/publisher-media-kit/pull/129)).
 * **Changed:** WordPress "tested up to" version 6.2 (props [@jayedul](https://github.com/jayedul), [@faisal-alvi](https://github.com/faisal-alvi) via [#142](https://github.com/10up/publisher-media-kit/pull/142)).

diff --git a/tests/cypress/integration/pmk-block-patterns.test.js b/tests/cypress/integration/pmk-block-patterns.test.js
@@ -4,7 +4,7 @@ describe('Check if Media Kit Block Pattern is available for use', () => {
         cy.closeWelcomeGuide();
         cy.get('#post-title-0, h1.editor-post-title__input').click().type('Test Block Pattern');
         cy.get('.edit-post-header-toolbar__inserter-toggle').click();
-        cy.get('.components-tab-panel__tabs button:nth-child(2)').click();
+        cy.get('.components-tab-panel__tabs button').contains( 'Patterns' ).click();
 
         // (add version) If dropdown is available. (After WP 5.?)
         cy.get('body').then(($body) => {