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

Revert FXIOS-8052 [v121] logins key logic updates (backport #17954) #17962

Merged
merged 2 commits into from
Jan 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 2, 2024

This is an automatic backport of pull request #17954 done by Mergify.
Cherry-pick of bc7f27a has failed:

On branch mergify/bp/release/v121/pr-17954
Your branch is up to date with 'origin/release/v121'.

You are currently cherry-picking commit bc7f27a9f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Providers/RustSyncManager.swift
	modified:   Shared/Prefs.swift
	modified:   firefox-ios/Tests/ClientTests/PasswordManagerViewModelTests.swift
	modified:   firefox-ios/Tests/ClientTests/RustSyncManagerTests.swift
	modified:   firefox-ios/Tests/UnitTest.xctestplan

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Storage/Rust/RustLogins.swift
	both modified:   firefox-ios/Tests/StorageTests/RustLoginsTests.swift

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit bc7f27a)

# Conflicts:
#	Storage/Rust/RustLogins.swift
#	firefox-ios/Tests/StorageTests/RustLoginsTests.swift
@mergify mergify bot requested a review from a team as a code owner January 2, 2024 18:28
@mergify mergify bot requested review from nbhasin2 and removed request for a team January 2, 2024 18:28
@mergify mergify bot added the conflicts label Jan 2, 2024
@mobiletest-ci-bot
Copy link

Messages
📖 Project coverage: 34.81%
📖 Edited 7 files
📖 Created 0 files

Client.app: Coverage: 32.01

File Coverage
RustSyncManager.swift 23.79% ⚠️

CredentialProvider.appex: Coverage: 21.68

File Coverage
RustSyncManager.swift 23.79% ⚠️

NotificationService.appex: Coverage: 24.45

File Coverage
RustSyncManager.swift 23.79% ⚠️

ShareTo.appex: Coverage: 35.33

File Coverage
RustSyncManager.swift 23.79% ⚠️

libStorage.a: Coverage: 59.27

File Coverage
RustLogins.swift 43.31% ⚠️

Generated by 🚫 Danger Swift against 7bef9c4

Copy link
Contributor

@rvandermeulen rvandermeulen left a comment

Choose a reason for hiding this comment

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

Approved for 121.1

@rvandermeulen rvandermeulen merged commit b82612c into release/v121 Jan 2, 2024
9 of 10 checks passed
@rvandermeulen rvandermeulen deleted the mergify/bp/release/v121/pr-17954 branch January 2, 2024 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants