Roll back CPM post-rollout cleanup #2599
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
…)" This reverts commit 5dcdabd.
jaceklyp
approved these changes
Mar 15, 2024
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
# By Diego Rey Mendez (2) and others # Via GitHub * main: Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
* main: Update wireguard-apple to 1.1.3 (#2598) Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) Subscriptions - 21. Manage Billing options to third parties (#2574) 17. Subscription Review Fixes (#2547) bump bsk to fix retain cycle (#2595) New log for SKAd 4 integration (#2594) NetP x Subscription Clean-up (#2565) Update BSK to include latest macOS changes (#2588)
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
…-lottie-animation * sam/vpn-ui-improvements: Update wireguard-apple to 1.1.3 (#2598) Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) Subscriptions - 21. Manage Billing options to third parties (#2574) 17. Subscription Review Fixes (#2547) bump bsk to fix retain cycle (#2595) New log for SKAd 4 integration (#2594) NetP x Subscription Clean-up (#2565) Update BSK to include latest macOS changes (#2588)
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
…n-ui-improvements-3-combine-notification-settings * sam/vpn-ui-improvements-2-lottie-animation: Update wireguard-apple to 1.1.3 (#2598) Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) Subscriptions - 21. Manage Billing options to third parties (#2574) 17. Subscription Review Fixes (#2547) bump bsk to fix retain cycle (#2595) New log for SKAd 4 integration (#2594) NetP x Subscription Clean-up (#2565) Update BSK to include latest macOS changes (#2588)
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
…' into sam/vpn-ui-improvements-4-location-setting-change # By Daniel Bernal (3) and others # Via Sam Symons (3) and GitHub (1) * sam/vpn-ui-improvements-3-combine-notification-settings: Update wireguard-apple to 1.1.3 (#2598) Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) Subscriptions - 21. Manage Billing options to third parties (#2574) 17. Subscription Review Fixes (#2547) bump bsk to fix retain cycle (#2595) New log for SKAd 4 integration (#2594) NetP x Subscription Clean-up (#2565) Update BSK to include latest macOS changes (#2588) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
* main: (31 commits) Use History in Suggestions on iOS (#2552) Update wireguard-apple to 1.1.3 (#2598) Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) Subscriptions - 21. Manage Billing options to third parties (#2574) 17. Subscription Review Fixes (#2547) bump bsk to fix retain cycle (#2595) New log for SKAd 4 integration (#2594) NetP x Subscription Clean-up (#2565) Update BSK to include latest macOS changes (#2588) rollback #URL macro (#2585) Release 7.112.0-2 (#2579) Updates BSK (#2577) ...
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.
Task/Issue URL: https://app.asana.com/0/414235014887631/1206850469068241/f
Tech Design URL:
CC:
Description:
Rolls back #2537 due to a bug found in iOS (https://app.asana.com/0/414709148257752/1206847376910045/f)
Steps to test this PR:
Internal references:
Software Engineering Expectations
Technical Design Template