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-7853 [v122] Redux pattern protocol improvements (backport #17542) #17626

Merged
merged 2 commits into from
Dec 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2023

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

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

You are currently cherry-picking commit b7db64ae9.
  (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:   BrowserKit/Sources/Redux/StoreSubscriber.swift
	modified:   BrowserKit/Tests/ReduxTests/Utilities/FakeReduxViewController.swift
	modified:   Client/Frontend/Browser/BrowserViewController.swift
	modified:   Client/Frontend/Browser/Tabs/RemoteTabs/RemoteTabsPanel.swift
	modified:   Client/Frontend/Settings/ThemeSettings/ThemeSettingsController.swift

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Client/Frontend/Browser/Tabs/TabDisplayViewController.swift
	both modified:   Client/Frontend/Browser/Tabs/TabTrayViewController.swift
	both modified:   Client/Frontend/Home/HomepageViewController.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

* Add helper functions

* updates

* Update further places

* Update tests

---------

Co-authored-by: roux g. buciu <[email protected]>
(cherry picked from commit b7db64a)

# Conflicts:
#	Client/Frontend/Browser/Tabs/TabDisplayViewController.swift
#	Client/Frontend/Browser/Tabs/TabTrayViewController.swift
#	Client/Frontend/Home/HomepageViewController.swift
@mergify mergify bot requested a review from a team as a code owner December 5, 2023 16:48
@mergify mergify bot requested review from OrlaM and removed request for a team December 5, 2023 16:48
@mergify mergify bot added the conflicts label Dec 5, 2023
@mobiletest-ci-bot
Copy link

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

Client.app: Coverage: 31.88

File Coverage
TabTrayViewController.swift 67.37%
TabDisplayViewController.swift 32.61% ⚠️
BrowserViewController.swift 17.38% ⚠️
ThemeSettingsController.swift 39.45% ⚠️
RemoteTabsPanel.swift 43.36% ⚠️

Generated by 🚫 Danger Swift against 58f47cf

Copy link
Contributor

@adudenamedruby adudenamedruby left a comment

Choose a reason for hiding this comment

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

We did this on Zoom

@adudenamedruby adudenamedruby merged commit c6265ac into release/v121 Dec 5, 2023
9 of 10 checks passed
@adudenamedruby adudenamedruby deleted the mergify/bp/release/v121/pr-17542 branch December 5, 2023 17:37
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.

3 participants