Skip to content

Conversation

@salesforce-org-metaci
Copy link
Contributor

This pull request was automatically generated because an automated merge hit a merge conflict

@salesforce-org-metaci salesforce-org-metaci bot requested a review from a team as a code owner August 5, 2021 23:07
@salesforce-org-metaci salesforce-org-metaci bot requested review from jofsky and removed request for a team August 5, 2021 23:07
@salesforce-cla
Copy link

salesforce-cla bot commented Sep 7, 2021

Thanks for the contribution! It looks like @sgovindankutty is an internal user so signing the CLA is not required. However, we need to confirm this.

@salesforce-cla
Copy link

salesforce-cla bot commented Sep 9, 2021

Thanks for the contribution! Before we can merge this, we need @rjanjanam to sign the Salesforce.com Contributor License Agreement.

@salesforce-cla
Copy link

Thanks for the contribution! Before we can merge this, we need @skristem @rponti-sforg to sign the Salesforce.com Contributor License Agreement.

@salesforce-cla
Copy link

Thanks for the contribution! Before we can merge this, we need @rponti-sforg to sign the Salesforce.com Contributor License Agreement.

npsp-reedestockton and others added 19 commits December 9, 2023 17:56
…hold-regression-bugs

Fix Household Regression
…ted, it's not available for SOSL fast enough for the test to work
…3814-addr-encryption-fix

W-14773814 - Fix bug that prevents Address__c.MailingState__c from being encrypted
…-templates

Fix Gift Entry custom field bug
* Create read-this-for-all-support-and-questions.md

* Update README.md
add link to Issues Closed to release notes statement.

Co-authored-by: salesforce-org-metaci[bot] <53311887+salesforce-org-metaci[bot]@users.noreply.github.com>
andrewyu-salesforce and others added 28 commits October 6, 2025 14:03
…edge (Part 2) (#7310)

* Add instrumentation for the Level/EngagementPlans batch job results

* Update Level/Engagement Plan batch job instrumentation

* Add instrumentation for address creation across its various entry points

* Update instrumentation for Contact Merging to include more

* Fix failing test

* Add logic to include Quiddity in all instrumentation logs

* Add instrumentation for household naming

* Fix failing tests

* Add comments to indicate that the CRLP related Callable API's were for internal use only (old archival product) and currently not used.

* Add instrumentation to Feature Management api calls

* prevent legacy rd metadata tests from running in an org that already has enhanced rd metadata deployed

* Update to avoid instrumenting the initial state of some values

* Ensure all instrumentation includes the SourceClass

* Revert featureManagement instrumentation

---------

Co-authored-by: salesforce-org-metaci[bot] <53311887+salesforce-org-metaci[bot]@users.noreply.github.com>
* Resovle error in NPSP settings page

* There are over 500 gack with an error for "caused by: Cannot read properties of null (reading 'length')]"  associated with the STG_SettingsManager page and the `sendProgressEvents()` method. This should resolve that.

---------

Co-authored-by: salesforce-org-metaci[bot] <53311887+salesforce-org-metaci[bot]@users.noreply.github.com>
…se-fixes

@W-20174507 - Test fixes for 260 Feature Branch Failures
…fixes

@W-20174507 - Fixing 260 Feature Tests
@salesforce-cla
Copy link

Thanks for the contribution! Unfortunately we can't verify the commit author(s): Melissa Barber <m***@s***.com>. One possible solution is to add that email to your GitHub account. Alternatively you can change your commits to another email and force push the change. After getting your commits associated with your GitHub account, refresh the status of this Pull Request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants