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

[Gallery][Wasm] MediaPlayerElement, [X] Close button does not work for customizable option once click on the last sample option. (backport #784) #868

Merged
merged 4 commits into from
Aug 15, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 14, 2023

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

On branch mergify/bp/legacy/4x/pr-784
Your branch is ahead of 'origin/legacy/4x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c4b0ac6.
  (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:   Uno.Gallery/Uno.Gallery.Shared/Views/NestedPages/MediaPlayerElementSample_NestedPage5.xaml.cs
	modified:   Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/MediaPlayerElementSamplePage.xaml.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj

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

rafael-rosa-knowcode and others added 3 commits August 14, 2023 17:54
(cherry picked from commit c4b0ac6)

# Conflicts:
#	Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
(cherry picked from commit d9b7b49)
@MartinZikmund MartinZikmund merged commit 75131cf into legacy/4x Aug 15, 2023
@MartinZikmund MartinZikmund deleted the mergify/bp/legacy/4x/pr-784 branch August 15, 2023 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants