Skip to content

[stable27] Revert "Fix table view" #38474

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
Merged
ChristophWurst merged 2 commits into from
Jun 16, 2023
Merged

[stable27] Revert "Fix table view" #38474

ChristophWurst merged 2 commits into from
Jun 16, 2023

Conversation

@backportbot-nextcloud
Copy link

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

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

backport of #38458

Fix #38691

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 27 milestone May 25, 2023
@ChristophWurst ChristophWurst added the 2. developing Work in progress label May 30, 2023
@ChristophWurst ChristophWurst mentioned this pull request May 30, 2023
Closed
9 tasks
@skjnldsv skjnldsv mentioned this pull request May 31, 2023
Merged
16 tasks
@skjnldsv
Copy link
Member

skjnldsv commented Jun 1, 2023

@JuliaKirschenheuter what is the status?

@ChristophWurst
Copy link
Member

ChristophWurst commented Jun 1, 2023

I can only spot conflicts in the bundles.

@ChristophWurst
Copy link
Member

ChristophWurst commented Jun 1, 2023

/compile amend /

@nextcloud-command nextcloud-command force-pushed the backport/38458/stable27 branch from 3e7fb2f to f380cbf Compare June 1, 2023 13:55
@ChristophWurst ChristophWurst added 3. to review Waiting for reviews 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress 4. to release Ready to be released and/or waiting for tests to finish labels Jun 1, 2023
@ChristophWurst ChristophWurst marked this pull request as ready for review June 1, 2023 14:44
@ChristophWurst
Copy link
Member

ChristophWurst commented Jun 1, 2023

/rebase

@ChristophWurst ChristophWurst force-pushed the backport/38458/stable27 branch 2 times, most recently from f3b200d to 8eea7ff Compare June 1, 2023 15:45
@ChristophWurst
Copy link
Member

ChristophWurst commented Jun 1, 2023

/compile amend /

1 similar comment
@ChristophWurst
Copy link
Member

ChristophWurst commented Jun 1, 2023

/compile amend /

@ChristophWurst ChristophWurst force-pushed the backport/38458/stable27 branch from 8eea7ff to 58bd613 Compare June 1, 2023 16:47
szaimen
szaimen approved these changes Jun 1, 2023
View reviewed changes
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.

🐘

@szaimen szaimen mentioned this pull request Jun 7, 2023
Closed
9 tasks
@skjnldsv skjnldsv mentioned this pull request Jun 8, 2023
Merged
22 tasks
@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@szaimen szaimen mentioned this pull request Jun 7, 2023
Closed
30 tasks
@JuliaKirschenheuter
Revert "Fix table view"
83f2cc2 
This reverts commit cb852ef

Signed-off-by: julia.kirschenheuter <[email protected]>
@JuliaKirschenheuter JuliaKirschenheuter self-assigned this Jun 14, 2023
@ChristophWurst
Copy link
Member

ChristophWurst commented Jun 14, 2023

@JuliaKirschenheuter can you give this a test please? The PR was created by the bot. You can approve it too.

JuliaKirschenheuter
JuliaKirschenheuter reviewed Jun 16, 2023
View reviewed changes
Copy link
Contributor

@JuliaKirschenheuter JuliaKirschenheuter left a comment

Choose a reason for hiding this comment

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

tested on NC27 and compared all changes with original PR

@JuliaKirschenheuter JuliaKirschenheuter self-requested a review June 16, 2023 15:03
ChristophWurst
ChristophWurst approved these changes Jun 16, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Let's go

@ChristophWurst ChristophWurst merged commit 78c5a00 into stable27 Jun 16, 2023
@ChristophWurst ChristophWurst deleted the backport/38458/stable27 branch June 16, 2023 15:20
@blizzz blizzz mentioned this pull request Jul 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@JuliaKirschenheuter JuliaKirschenheuter JuliaKirschenheuter approved these changes

@szaimen szaimen szaimen approved these changes

@Pytal Pytal Awaiting requested review from Pytal

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

@JuliaKirschenheuter JuliaKirschenheuter

Labels

3. to review Waiting for reviews regression

Projects

None yet

Milestone

Nextcloud 27.0.1

Development

Successfully merging this pull request may close these issues.

5 participants

@skjnldsv @ChristophWurst @JuliaKirschenheuter @szaimen