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

[MergeDups] Enable word/sense protection bypass #3445

Merged
merged 36 commits into from
Feb 28, 2025
Merged

Conversation

imnasnainaec
Copy link
Collaborator

@imnasnainaec imnasnainaec commented Nov 13, 2024

Follows #3562, #3607
Resolves #3444


This change is Reviewable

@imnasnainaec imnasnainaec added enhancement New feature or request goal: MergeDup labels Nov 13, 2024
@imnasnainaec imnasnainaec self-assigned this Nov 13, 2024

This comment has been minimized.

Copy link

codecov bot commented Nov 13, 2024

Codecov Report

Attention: Patch coverage is 30.13699% with 51 lines in your changes missing coverage. Please review.

Project coverage is 74.22%. Comparing base (b1f3ebe) to head (eb6fd6b).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
...geDuplicates/MergeDupsStep/MergeDragDrop/index.tsx 7.31% 38 Missing ⚠️
...MergeDuplicates/MergeDupsStep/SaveDeferButtons.tsx 0.00% 6 Missing ⚠️
...nents/ProjectSettings/ProjectProtectedOverride.tsx 57.14% 3 Missing ⚠️
...s/MergeDupsStep/MergeDragDrop/SidebarDragSense.tsx 0.00% 2 Missing ⚠️
...ergeDuplicates/MergeDupsStep/protectReasonUtils.ts 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3445      +/-   ##
==========================================
- Coverage   74.43%   74.22%   -0.21%     
==========================================
  Files         284      285       +1     
  Lines       11056    11116      +60     
  Branches     1357     1370      +13     
==========================================
+ Hits         8229     8251      +22     
- Misses       2434     2472      +38     
  Partials      393      393              
Flag Coverage Δ
backend 83.89% <100.00%> (+0.01%) ⬆️
frontend 65.81% <25.00%> (-0.33%) ⬇️

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.

This comment has been minimized.

@imnasnainaec imnasnainaec marked this pull request as ready for review January 30, 2025 15:46
@imnasnainaec imnasnainaec changed the title [MergeDups] Enable bypassing protection of protected words and senses [MergeDups] Enable word/sense protection bypass Feb 12, 2025
@imnasnainaec imnasnainaec marked this pull request as ready for review February 12, 2025 20:18
Copy link
Collaborator

@andracc andracc left a comment

Choose a reason for hiding this comment

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

Reviewed 14 of 20 files at r1, 10 of 11 files at r2, 2 of 3 files at r3, 1 of 1 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @imnasnainaec)

@imnasnainaec imnasnainaec merged commit ba87e87 into master Feb 28, 2025
18 checks passed
@imnasnainaec imnasnainaec deleted the merge-unprotect branch February 28, 2025 13:07
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.

[MergeDups] Allow override of protected words/senses
2 participants