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

fix(merge-editor): some scm provider cannot switch to text editor #3799

Merged
merged 3 commits into from
Jun 21, 2024

Conversation

bytemain
Copy link
Member

Types

  • 🐛 Bug Fixes

Background or solution

我们在 web 端加载代码的插件是 webscm,切换到 merge editor 后切换不回 text editor 了

Changelog

some scm provider cannot switch merge editor to text editor

Copy link

railway-app bot commented Jun 21, 2024

🚅 Previously deployed to Railway in the core project. Environment has been deleted.

@opensumi opensumi bot added the 🐞 bug Something isn't working label Jun 21, 2024
Copy link

codecov bot commented Jun 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.18%. Comparing base (584bdd5) to head (73a5052).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3799      +/-   ##
==========================================
+ Coverage   55.16%   55.18%   +0.01%     
==========================================
  Files        1548     1548              
  Lines       94405    94405              
  Branches    19360    19360              
==========================================
+ Hits        52083    52093      +10     
+ Misses      35130    35122       -8     
+ Partials     7192     7190       -2     
Flag Coverage Δ
jsdom 50.61% <ø> (+0.01%) ⬆️
node 15.59% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bytemain bytemain merged commit d45e20c into main Jun 21, 2024
12 checks passed
@bytemain bytemain deleted the fix/webscm-switch-editor branch June 21, 2024 09:03
@bytemain
Copy link
Member Author

/next

@bytemain
Copy link
Member Author

/backport to v3.1

@opensumi
Copy link
Contributor

opensumi bot commented Jun 26, 2024

Backporting to v3.1 branch is started.
Please see: https://github.com/opensumi/actions/actions/workflows/backport-pr.yml

@opensumi
Copy link
Contributor

opensumi bot commented Jun 26, 2024

🎉 PR Next publish successful!

3.1.2-next-1719380824.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants