fix(ads): resolve conflicts from hotfix merge #1685
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miguelpeixe
added
the
[Status] Needs Review
dkoo
approved these changes
Jun 2, 2022
There was a problem hiding this comment.
Both the default and disconnected ad units work as expected. 👍 Something for the future: we might want to provide some UI to remove/hide/archive disconnected ad units, either one by one or in batch, in case someone intentionally wants to disconnect GAM and reconnect a different account with different ad units.
github-actions
bot
added
[Status] Approved
|
Thanks, @dkoo! That could be useful, although, once a new GAM account is connected the synced units are replaced automatically. |
matticbot
pushed a commit
that referenced
this pull request
Jun 3, 2022
# [1.84.0-alpha.3](v1.84.0-alpha.2...v1.84.0-alpha.3) (2022-06-03) ### Bug Fixes * **ads:** resolve conflicts from hotfix merge ([#1685](#1685)) ([8ce12cd](8ce12cd))
|
🎉 This PR is included in version 1.84.0-alpha.3 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
matticbot
pushed a commit
that referenced
this pull request
Jun 13, 2022
# [1.84.0](v1.83.3...v1.84.0) (2022-06-13) ### Bug Fixes * **ads:** resolve conflicts from hotfix merge ([#1685](#1685)) ([8ce12cd](8ce12cd)) * **reader-revenue:** initial order state with total of 0 ([7c30b09](7c30b09)) ### Features * **ads:** handle gam default ad units ([#1654](#1654)) ([321b98e](321b98e)) * **analytics:** automatically link GA4 with Site Kit ([#1698](#1698)) ([266135f](266135f)) * reader registration on donate ([#1655](#1655)) ([5821b57](5821b57)) * remove theme selection from setup wizard ([#1656](#1656)) ([94e4580](94e4580))
|
🎉 This PR is included in version 1.84.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All Submissions:
Changes proposed in this Pull Request:
The optimistic release merge from fc6fd3f replaced code from the still unreleased #1654.
This PR adjusts the UI to accommodate both enhancements.
How to test the changes in this Pull Request:
Instructions at Automattic/newspack-ads#429
Other information: