Skip to content

Revert "Revert "feat: remove field-data binding from the runtime [FC-0026]" (openedx#32740)" - #32737

Merged
Agrendalath merged 1 commit into
openedx:masterfrom
open-craft:agrendalath/revert-revert_fc-0026-cache_runtime_services_and_wrappers
Jul 19, 2023
Merged

Revert "Revert "feat: remove field-data binding from the runtime [FC-0026]" (openedx#32740)"#32737
Agrendalath merged 1 commit into
openedx:masterfrom
open-craft:agrendalath/revert-revert_fc-0026-cache_runtime_services_and_wrappers

Conversation

@Agrendalath

@Agrendalath Agrendalath commented Jul 13, 2023

Copy link
Copy Markdown
Member

This reverts commit c6bd98e (from #32730), which reverted #32420. It also reverts cd31c18 and d5cd535 (from #32740), which reverted #32357.

Edit: apparently, #32740 was squashed, so we cannot cleanly revert it anymore. We will need to revert fa06be1 instead.

That first revert didn't fix the issue, so we can revert this revert. If #32740 won't fix this issue, too, we can do a clean rebase of this PR through the GitHub UI (to drop the first two commits, which are in the mentioned PR).

This reverts #32740. After reproducing the issue locally, it turned out that the first revert (#32730) fixed the underlying issue.

@Agrendalath
Agrendalath requested a review from ormsbee July 13, 2023 15:25
@Agrendalath Agrendalath self-assigned this Jul 13, 2023
@openedx-webhooks openedx-webhooks added open-source-contribution PR author is not from Axim or 2U core committer labels Jul 13, 2023
@openedx-webhooks

Copy link
Copy Markdown

Thanks for the pull request, @Agrendalath!

As a core committer in this repo, you can merge this once the pull request is approved per the core committer reviewer requirements and according to the agreement with your edX Champion.

@Agrendalath
Agrendalath force-pushed the agrendalath/revert-revert_fc-0026-cache_runtime_services_and_wrappers branch 2 times, most recently from d7fd25b to d113890 Compare July 13, 2023 17:22
@Agrendalath
Agrendalath force-pushed the agrendalath/revert-revert_fc-0026-cache_runtime_services_and_wrappers branch from d113890 to b574fc0 Compare July 18, 2023 15:49
@Agrendalath
Agrendalath requested a review from ormsbee July 18, 2023 15:49
@Agrendalath Agrendalath changed the title Revert "Revert "refactor: reuse services and wrappers between XBlocks" (#32730)" Revert "Revert "feat: remove field-data binding from the runtime [FC-0026]" (openedx#32740)" Jul 18, 2023
@Agrendalath

Copy link
Copy Markdown
Member Author

@ormsbee, I updated this PR to re-revert only the field-data commit.

@Agrendalath
Agrendalath merged commit 6825088 into openedx:master Jul 19, 2023
@Agrendalath
Agrendalath deleted the agrendalath/revert-revert_fc-0026-cache_runtime_services_and_wrappers branch July 19, 2023 13:36
@openedx-webhooks

Copy link
Copy Markdown

@Agrendalath 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production.

@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

2U Release Notice: This PR has been deployed to the edX production environment.

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

Labels

core committer open-source-contribution PR author is not from Axim or 2U

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants