[PM-18433] Welcome Authenticator app! #1394
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
Replace tech-leads with dept-development-mobile
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> Co-authored-by: Katherine Bertelsen <kbertelsen@bitwarden.com>
Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Katherine Bertelsen <kbertelsen@bitwarden.com>
Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
# Conflicts: # .checkmarx/config.yml # .github/CODEOWNERS # .github/ISSUE_TEMPLATE/bug.yml # .github/ISSUE_TEMPLATE/config.yml # .github/codecov.yml # .github/workflows/build-bwa.yml # .github/workflows/crowdin-pull-bwa.yml # .github/workflows/scan-bwa.yml # .github/workflows/test-bwa.yml # .gitignore # .swiftformat # .swiftlint.yml # Networking/Sources/Networking/Extensions/Logger+Networking.swift # Networking/Sources/Networking/HTTPMethod.swift # Networking/Sources/Networking/HTTPResponse.swift # Networking/Sources/Networking/HTTPService.swift # Networking/Tests/NetworkingTests/Extensions/URLSessionHTTPClientTests.swift # Networking/Tests/NetworkingTests/HTTPRequestTests.swift # Networking/Tests/NetworkingTests/HTTPResponseTests.swift # Networking/Tests/NetworkingTests/RequestTests.swift # Networking/Tests/NetworkingTests/ResponseTests.swift # SECURITY.md
|
Great job, no security vulnerabilities found in this Pull Request |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1394 +/- ##
=======================================
Coverage 89.67% 89.68%
=======================================
Files 765 765
Lines 48082 48082
=======================================
+ Hits 43118 43121 +3
+ Misses 4964 4961 -3 ☔ View full report in Codecov by Sentry. |
fedemkr
approved these changes
Feb 27, 2025
KatherineInCode
approved these changes
Feb 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
PM-18433
📔 Objective
Brings the Authenticator repo full git history.
Warning
Merge Strategy has to be set to Merge before merging this PR
Both repos were prepared ahead of time with the goal of reducing conflicts but manual resolution was still required. Use the following command to review how files were merged:
git show 6686f2688ccf7a1f7abd0ca4b98859a87d6f5f04Additionally, had to remove Network folder package files that were initially removed in #1362. This means that
test-bwa.ymlandbuild-bwa.ymlwill fail for the time before we update project setup filesHere's an overview of how each conflict was handled:
⏰ 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