Skip to content

Comments

[FS-1267] Patch issue with initial commit bundle throwing a global team conversation error#2887

Merged
elland merged 2 commits intodevelopfrom
fs-1267-patch-commit-bundle-error-bc-of-gtc
Nov 30, 2022
Merged

[FS-1267] Patch issue with initial commit bundle throwing a global team conversation error#2887
elland merged 2 commits intodevelopfrom
fs-1267-patch-commit-bundle-error-bc-of-gtc

Conversation

@elland
Copy link
Contributor

@elland elland commented Nov 30, 2022

This fixes the weird case where a regular conversation would be mistaken for a GTC, adds a test case against regressions.

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@elland elland requested a review from smatting November 30, 2022 14:15
@elland elland temporarily deployed to cachix November 30, 2022 14:15 Inactive
@elland elland requested review from pcapriotti and removed request for smatting November 30, 2022 14:15
@elland elland temporarily deployed to cachix November 30, 2022 14:15 Inactive
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Nov 30, 2022
@elland elland requested a review from smatting November 30, 2022 14:17
Copy link
Contributor

@pcapriotti pcapriotti left a comment

Choose a reason for hiding this comment

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

I still think we should not be fetching the global team conversation unconditionally here, rather check if the ID matches the one of the global team conversation, and only fetch it then. Otherwise we're doing two almost identical queries for each conversation. Am I missing something?

@elland elland merged commit 1cc2bd2 into develop Nov 30, 2022
@elland elland deleted the fs-1267-patch-commit-bundle-error-bc-of-gtc branch November 30, 2022 15:34
smatting added a commit that referenced this pull request Dec 9, 2022
…lobal team conversation error (#2887)"

This reverts commit 1cc2bd2.
@smatting smatting mentioned this pull request Dec 9, 2022
1 task
smatting added a commit that referenced this pull request Dec 9, 2022
* Revert "[FS-1267] Patch issue with initial commit bundle throwing a global team conversation error (#2887)"

This reverts commit 1cc2bd2.

* Revert "Commented out GTC for release. (#2879)"

This reverts commit 49da310.

* Revert "Improve global team conversation handling and self conversation creation error. (#2862)"

This reverts commit 381bf7b.

* Revert "[FS-926] Create new conversation type for global team conversation (#2753)"

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

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants