Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing FirstParty Data deep-merge issue #4950 #5039

Merged
merged 1 commit into from
Apr 15, 2020

Conversation

leonardlabat
Copy link
Contributor

Use a deepmerge function to merge both globa level config & bidder specific config

Fixing issue #4950

@leonardlabat
Copy link
Contributor Author

Reopened a fresh PR in replacement of #4951
(to remove noise from the merge with master branch)

@bretg bretg changed the title Fixing issue #4950 Fixing FirstParty Data deep-merge issue #4950 Mar 30, 2020
@bretg bretg requested a review from msm0504 March 30, 2020 16:35
Copy link
Contributor

@msm0504 msm0504 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@msm0504 msm0504 added the needs 2nd review Core module updates require two approvals from the core team label Mar 30, 2020
@stale
Copy link

stale bot commented Apr 13, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the stale label Apr 13, 2020
@msm0504 msm0504 removed the stale label Apr 14, 2020
@msm0504
Copy link
Contributor

msm0504 commented Apr 14, 2020

@leonardlabat Please resolve conflicts with prebid:master. Afterwards, I'll merge this PR.

@leonardlabat
Copy link
Contributor Author

leonardlabat commented Apr 15, 2020

@msm0504 done

thanks !

@msm0504 msm0504 added LGTM and removed needs 2nd review Core module updates require two approvals from the core team labels Apr 15, 2020
@msm0504 msm0504 merged commit e4d7596 into prebid:master Apr 15, 2020
redaguermas added a commit to redaguermas/Prebid.js that referenced this pull request Apr 20, 2020
* 'master' of https://github.com/prebid/Prebid.js:
  Revert "New LuponMedia Bid Adapter (prebid#5120)" (prebid#5145)
  New LuponMedia Bid Adapter (prebid#5120)
  Feature/send publisher domain (prebid#5121)
  update test adunit params (prebid#5135)
  add parameter to the conversant adapter to override the url (prebid#5133)
  Replace call to old url module with call to utils (prebid#5136)
  GumGum: uses encodeURIComponent inline (prebid#5124)
  User ID's (liveramp, britepool) and gdpr (prebid#5114)
  fix wipes adapter response (prebid#5134)
  Submitting Tercept Analytics Adapter (prebid#5099)
  hotfix - undefined consent (prebid#5127)
  parrableIdSystem: Send current page location to back-end (prebid#5123)
  Increment pre version
  Prebid 3.16.0 Release
  Use a deepmerge function to merge both globa level config & bidder specific config (prebid#5039)
  Update appnexusBidAdapter.js (prebid#4893)
  Quantcast: Block bids without purpose 1 consent (prebid#5046)
  ShowHeroes adapter v2 (prebid#5085)
  Qc/qc usersyncs (prebid#4923)
redaguermas added a commit to redaguermas/Prebid.js that referenced this pull request Apr 20, 2020
* master:
  Revert "New LuponMedia Bid Adapter (prebid#5120)" (prebid#5145)
  New LuponMedia Bid Adapter (prebid#5120)
  Feature/send publisher domain (prebid#5121)
  update test adunit params (prebid#5135)
  add parameter to the conversant adapter to override the url (prebid#5133)
  Replace call to old url module with call to utils (prebid#5136)
  GumGum: uses encodeURIComponent inline (prebid#5124)
  User ID's (liveramp, britepool) and gdpr (prebid#5114)
  fix wipes adapter response (prebid#5134)
  Submitting Tercept Analytics Adapter (prebid#5099)
  hotfix - undefined consent (prebid#5127)
  parrableIdSystem: Send current page location to back-end (prebid#5123)
  Increment pre version
  Prebid 3.16.0 Release
  Use a deepmerge function to merge both globa level config & bidder specific config (prebid#5039)
  Update appnexusBidAdapter.js (prebid#4893)
  Quantcast: Block bids without purpose 1 consent (prebid#5046)
  ShowHeroes adapter v2 (prebid#5085)
  Qc/qc usersyncs (prebid#4923)
iggyfisk pushed a commit to happypancake/Prebid.js that referenced this pull request Jun 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants