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.

Sign up for GitHub

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

Jump to bottom

[stable27] Fix app menu flicker #38563

Merged
merged 1 commit into from Aug 3, 2023
Merged

[stable27] Fix app menu flicker #38563

merged 1 commit into from Aug 3, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 31, 2023 •
edited by szaimen

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #38549

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 27 milestone May 31, 2023
@szaimen
Copy link
Contributor

szaimen commented May 31, 2023

/compile amend /

@szaimen szaimen added the 3. to review Waiting for reviews label May 31, 2023
@szaimen szaimen marked this pull request as ready for review May 31, 2023 19:39
@skjnldsv skjnldsv mentioned this pull request Jun 8, 2023
Merged
22 tasks
@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@blizzz blizzz mentioned this pull request Jul 10, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Jul 10, 2023

/compile amend /

@blizzz
Copy link
Member

blizzz commented Jul 11, 2023

still conflicts :-/

@blizzz
Copy link
Member

blizzz commented Jul 13, 2023

moving to 27.0.2

@blizzz blizzz mentioned this pull request Aug 2, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Aug 2, 2023

conflicts @ZetaTom @szaimen

@ZetaTom @mejo-
Fix app menu flicker
bd28a0a 
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
Copy link
Member

mejo- commented Aug 3, 2023

Psalm failure unrelated, same failure already on stable27 branch - and the PR has no changes in PHP code anyway.

@blizzz blizzz merged commit 7307211 into stable27 Aug 3, 2023
36 of 38 checks passed
@blizzz blizzz deleted the backport/38549/stable27 branch August 3, 2023 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pytal Pytal Pytal approved these changes

@szaimen szaimen szaimen approved these changes

@ZetaTom ZetaTom ZetaTom approved these changes

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug
Projects
None yet
Milestone
Nextcloud 27.0.2
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@szaimen @blizzz @mejo- @Pytal @ZetaTom @skjnldsv