Backport 'release/2024.10-rc1' #1108
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Federico Maccaroni <[email protected]> Co-authored-by: Pranish <[email protected]> Co-authored-by: aj-rosado <[email protected]> Co-authored-by: Phil Cappelli <[email protected]>
# Conflicts: # .xcode-version # BitwardenShared/Core/Vault/Repositories/VaultRepositoryTests.swift # BitwardenShared/UI/Auth/Landing/LandingProcessor.swift # BitwardenShared/UI/Platform/Application/Support/Localizations/en.lproj/Localizable.strings # BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_edit_withOptions_withValues.1.png # BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_extension_withValues.1.png # BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_withValues.1.png # BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withValues.1.png # BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.16.png # BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.17.png # BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.18.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues_largeText.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_disabledViewPassword.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_hiddenTotp.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_exceptTotp_noPremium.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_largeText.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium_largeText.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_dark.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_largeText.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_dark.1.png # BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_largeText.1.png
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1108 +/- ##
==========================================
+ Coverage 89.40% 89.41% +0.01%
==========================================
Files 679 679
Lines 43030 43034 +4
==========================================
+ Hits 38470 38481 +11
+ Misses 4560 4553 -7 ☔ View full report in Codecov by Sentry. |
matt-livefront
previously approved these changes
Nov 4, 2024
| compiler-flags: | ||
| description: "Compiler Flags - e.g. 'DEBUG_MENU FEATURE2'" | ||
| type: string | ||
| default: "DEBUG_MENU" |
Collaborator
There was a problem hiding this comment.
🤔 just want to make sure this change is intended?
Member
Author
There was a problem hiding this comment.
I would think so @vvolkgang could you confirm?
Member
There was a problem hiding this comment.
We need it in main but for visibility, let's revert it from this merge and I'll open a PR with this change targeting main.
Member
Author
There was a problem hiding this comment.
Btw nice catch Phil and it has been reverted Álison 😄
This reverts commit 016f851.
phil-livefront
approved these changes
Nov 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
📔 Objective
Merge
release/2024.10-rc1intomainbranch with merge conflicts fixed.⏰ Reminders before review
🦮 Reviewer guidelines
:+1:) or similar for great changes:memo:) or ℹ️ (:information_source:) for notes or general info:question:) for questions:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:) for suggestions / improvements:x:) or:warning:) for more significant problems or concerns needing attention:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt:pick:) for minor or nitpick changes