Sync fork with upstream #4145
Closed
Sync fork with upstream #4145
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
Adding Procfile for Heroku and updating Go package
Reverting module name to prevent Go from downloading local packages from GitHub
Adding magic comment so that Heroku uses Go 1.12
Configuring instance to log more info on Heroku
chess app stored request add units
Chess app
Chess app
remove districtm, specify timeout in stored_request
try rubicon with display params for ios testing
Replace playwire adapter with grid (cherry picked from commit b838015)
encode url quotes, gitignore, larger timeout (cherry picked from commit a7ffc9e)
timeout 2s (cherry picked from commit eb80143)
CI/CD: Add dev deployment workflow (cherry picked from commit 2a293d1)
Cleaning up commit history to reduce conflicts with future upgrades Hundreds of files in this repo currently trigger conflicts when attempting to upgrade to a new version of Prebid Server, even though we never modified them. It's possible an earlier cherry-pick or rebase was done in the wrong direction and resulted in the upstream commits receiving new IDs that conflict with their originals whenever we try to upgrade. To fix the issue, this branch reapplies all our unreverted local changes to a fresh copy of the upstream code with the original commits. The copy is based off the last version we upgraded to, which was a commit just after the v0.236.0 tag (076d889). Local changes were cherry-picked from the merge commits of PRs where possible. In a few cases, changes had to be introduced more selectively to bring the code up to parity. This final commit is the product of running `git merge --strategy=ours develop`, which will ensure that all the new commits will take precedence over develop's.
[CU-86b240ppa] Cleaning up commit history to reduce conflicts with future upgrades
Revert "CI/CD: Add dev deployment workflow"
[CU-86b24ctjn] Removing unused Playwire and OpenRTB adapters
Upgrading to 0.275.0
[CU-86b1x0xvf] Upgrading to Prebid Server 0.275.0
Enabling bidder keys in targeting object of response for mobile apps
[CU-86b2mvvqc] Support keys added by Prebid.js's PAAPI module
Replacing "hb_pb" with "app" in targeting KVs for mobile app requests
…for mobile app requests"
Revert "[CU-86b2pc510] Replacing "hb_pb" with "app" in targeting KVs for mobile app requests"
Configuring price granularity for mobile app requests to match GAM line items
This borrows code from a later version of the upstream repo.
…st-timeout Turning hard-coded stored request timeout into configurable value
[CU-86b37j37f] Percent-encoding unsafe brackets in stored request URLs
Removing obsolete local stored imps and stored requests
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.
No description provided.