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

[stable30] fix(FileList): Show correct avatar for federated share owner #48294

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Sep 23, 2024

Backport of #48227

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested review from nfebe and sorbaugh September 23, 2024 11:59
@backportbot backportbot bot added this to the Nextcloud 30.0.1 milestone Sep 23, 2024
@nfebe nfebe changed the title [stable30] [stable29] fix(FileList): Show correct avatar for federated share owner [stable30] fix(FileList): Show correct avatar for federated share owner Sep 23, 2024
@nfebe nfebe force-pushed the backport/48227/stable30 branch from 1d1e0d4 to 0608ab2 Compare September 24, 2024 11:49
@nfebe nfebe marked this pull request as ready for review September 24, 2024 11:55
@nfebe nfebe requested a review from skjnldsv as a code owner September 24, 2024 11:55
@nfebe nfebe force-pushed the backport/48227/stable30 branch from 0608ab2 to d15bba3 Compare September 24, 2024 11:56
@nfebe nfebe requested a review from come-nc September 24, 2024 11:59
@nfebe
Copy link
Contributor

nfebe commented Sep 24, 2024

/backport to master

@nfebe nfebe enabled auto-merge September 24, 2024 12:55
@Altahrim Altahrim mentioned this pull request Oct 1, 2024
4 tasks
@Altahrim
Copy link
Collaborator

Altahrim commented Oct 2, 2024

/compile amend

This was referenced Oct 10, 2024
@Altahrim Altahrim mentioned this pull request Oct 30, 2024
2 tasks
@Altahrim Altahrim disabled auto-merge October 30, 2024 07:55
@Altahrim
Copy link
Collaborator

There is conflicts on this one. Can someone check?

@skjnldsv
Copy link
Member

I also fixed something similar last week...
Why is this PR starting in 29 and being backported up 🙈

@nfebe
Copy link
Contributor

nfebe commented Oct 30, 2024

I also #48887...
Why is this PR starting in 29 and being back-ported up 🙈

Because some of the changes that already existed in master where copied to 29 and not back-ported, the bug in question was only manifest in 29 and I think 30.

Rebasing to see what the diff would look like.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
@nfebe nfebe force-pushed the backport/48227/stable30 branch from 9df5ff7 to 2e31d35 Compare October 30, 2024 14:16
@nfebe
Copy link
Contributor

nfebe commented Oct 30, 2024

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nfebe nfebe enabled auto-merge October 30, 2024 15:08
@nfebe nfebe merged commit 69bf5f1 into stable30 Oct 30, 2024
171 checks passed
@nfebe nfebe deleted the backport/48227/stable30 branch October 30, 2024 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews 28-feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants