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-8107 [v121.2] Disable recently visited section and loading of the history highlights (backport #18060) #18069

Merged
merged 4 commits into from
Jan 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2024

This is an automatic backport of pull request #18060 done by Mergify.
Cherry-pick of 597220a has failed:

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

You are currently cherry-picking commit 597220a0b.
  (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/Common/Extensions/URLExtension.swift
	modified:   Client/Frontend/Home/HistoryHighlights/HistoryHighlightsDataAdaptor.swift
	modified:   firefox-ios/Tests/ClientTests/Coordinators/ShortcutRouteTests.swift
	modified:   firefox-ios/Tests/ClientTests/FeatureFlagManagerTests.swift
	modified:   firefox-ios/Tests/ClientTests/Frontend/Home/HistoryHighlights/HistoryHighlightsDataAdaptorTests.swift
	modified:   firefox-ios/Tests/ClientTests/Frontend/Home/HistoryHighlights/HistoryHighlightsViewModelTests.swift
	modified:   firefox-ios/Tests/ClientTests/Messaging/GleanPlumbMessageManagerTests.swift
	modified:   firefox-ios/Tests/ExperimentIntegrationTests.xctestplan
	modified:   firefox-ios/Tests/UnitTest.xctestplan
	modified:   nimbus-features/homescreenFeature.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   firefox-ios/Tests/XCUITests/HomePageSettingsUITest.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

…ding of the history highlights (#18060)

* Refactor FXIOS-8107 [v121.2] Disable recently visited section and loading of the history highlights

* lint fix

* lint fixes

* test fixes

* test fixes v2

* test fixes v3

* test fixes v4

* Disabled full test

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 597220a)

# Conflicts:
#	firefox-ios/Tests/XCUITests/HomePageSettingsUITest.swift
@mergify mergify bot requested a review from a team as a code owner January 9, 2024 23:58
@mergify mergify bot requested review from OrlaM and removed request for a team January 9, 2024 23:58
@mergify mergify bot added the conflicts label Jan 9, 2024
@mobiletest-ci-bot
Copy link

Messages
📖 Project coverage: 34.07%
📖 Edited 11 files
📖 Created 0 files

Client.app: Coverage: 31.98

File Coverage
HistoryHighlightsDataAdaptor.swift 79.41%

Common: Coverage: 69.59

File Coverage
URLExtension.swift 95.18%

Generated by 🚫 Danger Swift against ef5f2b4

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.2

@rvandermeulen rvandermeulen added the Needs Landing (Squash) Label used by mergify to land PR with several commits label Jan 10, 2024
@mergify mergify bot merged commit 19f1f1b into release/v121 Jan 10, 2024
12 checks passed
@mergify mergify bot deleted the mergify/bp/release/v121/pr-18060 branch January 10, 2024 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Needs Landing (Squash) Label used by mergify to land PR with several commits
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants