Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 11, 2023

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

Backport was fixed. From the initial PR only https://github.com/nextcloud/spreed/pull/9508/files#diff-1fdf1c31db343519a9914fec9debc8bbbfc0cfdf82a94a67d5658071349650a5L183-L184 is missing which is not existing on stable26

backport of #9508

Signed-off-by: Simon L <[email protected]>
@szaimen szaimen marked this pull request as ready for review May 11, 2023 11:42
@Antreesy Antreesy self-requested a review May 11, 2023 11:44
szaimen
szaimen previously approved these changes May 11, 2023
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

tested and works but didnt review the code

@nickvergessen nickvergessen dismissed szaimen’s stale review May 11, 2023 11:59

Dismissing so Maksim has to review it

Copy link
Contributor

@Antreesy Antreesy left a comment

Choose a reason for hiding this comment

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

Code is unchanged, except for emit declaration
Manually tested on stable26

@Antreesy Antreesy enabled auto-merge May 11, 2023 12:41
@szaimen
Copy link
Contributor

szaimen commented May 11, 2023

Seema like drone is stuck?

@szaimen
Copy link
Contributor

szaimen commented May 12, 2023

Can someone please restart drone?

@nickvergessen
Copy link
Member

I did

@szaimen
Copy link
Contributor

szaimen commented May 12, 2023

Thanks!

@Antreesy Antreesy merged commit 594c9c3 into stable26 May 12, 2023
@Antreesy Antreesy deleted the backport/9508/stable26 branch May 12, 2023 07:46
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.

4 participants