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

Refactor FXIOS-7596 [v121] remove legacy store (backport #17224) #17468

Merged
merged 1 commit into from
Nov 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2023

This is an automatic backport of pull request #17224 done by Mergify.
Cherry-pick of 21d5c81 has failed:

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

You are currently cherry-picking commit 21d5c818e.
  (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:   Client/Application/UITestAppDelegate.swift
	modified:   Client/Frontend/Browser/BrowserViewController/BrowserViewController+TabToolbarDelegate.swift
	modified:   Client/Frontend/Browser/Tabs/Legacy/LegacyGridTabViewController.swift
	modified:   Client/Frontend/Browser/Tabs/Legacy/LegacyTabTrayViewController.swift
	deleted:    Client/TabManagement/Legacy/LegacySavedTab+ConfigureExtension.swift
	modified:   Client/TabManagement/Legacy/LegacyTabManager.swift
	deleted:    Client/TabManagement/Legacy/LegacyTabManagerStore.swift
	modified:   Client/TabManagement/TabManagerImplementation.swift

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Client.xcodeproj/project.pbxproj

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

@mergify mergify bot requested a review from a team as a code owner November 24, 2023 20:22
@mergify mergify bot added the conflicts label Nov 24, 2023
@mergify mergify bot requested review from nbhasin2 and removed request for a team November 24, 2023 20:22
* Move select tab

* Update isRestoringTabs

* Remove legacy store

* Fix start up issue

* Remove store

* Clear more dead code

* Fix UI tests

* Fix tests

* Fix tests

* Fix tests

* Remove print
# Conflicts:
#	Client.xcodeproj/project.pbxproj
@OrlaM OrlaM force-pushed the mergify/bp/release/v121/pr-17224 branch from 84332a8 to 26dc5e4 Compare November 24, 2023 21:09
@OrlaM OrlaM removed the conflicts label Nov 24, 2023
@mobiletest-ci-bot
Copy link

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

Client.app: Coverage: 32.3

File Coverage
LegacyTabManager.swift 25.83% ⚠️
LegacyTabTrayViewController.swift 41.93% ⚠️
TabManagerImplementation.swift 49.39% ⚠️
UITestAppDelegate.swift 0.0% ⚠️
BrowserViewController+TabToolbarDelegate.swift 11.03% ⚠️
LegacyGridTabViewController.swift 31.4% ⚠️

Generated by 🚫 Danger Swift against 26dc5e4

@OrlaM OrlaM merged commit cceaa3f into release/v121 Nov 24, 2023
10 checks passed
@OrlaM OrlaM deleted the mergify/bp/release/v121/pr-17224 branch November 24, 2023 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants