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

[stable28] fix: avoid douple expireDate parsing #44912

Merged
merged 3 commits into from
Jun 11, 2024
Merged

[stable28] fix: avoid douple expireDate parsing #44912

merged 3 commits into from
Jun 11, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Apr 18, 2024 •
edited by nfebe
Loading

Backport of #44838

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

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

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

@backportbot backportbot bot requested review from Altahrim, artonge and nfebe April 18, 2024 01:30
@backportbot backportbot bot added 3. to review Waiting for reviews feature: sharing labels Apr 18, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.5 milestone Apr 18, 2024
@nfebe nfebe force-pushed the backport/44838/stable28 branch from d7c9de2 to 3cd5a7f Compare April 18, 2024 10:27
@nfebe nfebe marked this pull request as ready for review April 18, 2024 10:28
@nfebe nfebe force-pushed the backport/44838/stable28 branch from 3cd5a7f to 4292ff6 Compare April 18, 2024 10:48
@Altahrim Altahrim mentioned this pull request Apr 18, 2024
Merged
5 tasks
nickvergessen
nickvergessen requested changes Apr 18, 2024
View reviewed changes
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

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

This actually breaks Talk attachment:
https://github.com/nextcloud/spreed/actions/runs/8736657894/job/23972035833?pr=12147

@nfebe nfebe force-pushed the backport/44838/stable28 branch 3 times, most recently from 396244f to fc18a09 Compare April 20, 2024 17:05
@nfebe nfebe requested a review from nickvergessen April 20, 2024 17:08
@nfebe nfebe mentioned this pull request Apr 20, 2024
Closed
2 tasks
@nfebe
Copy link
Contributor

nfebe commented Apr 20, 2024

/backport to stable27

@nextcloud nextcloud deleted a comment from solracsf Apr 22, 2024
@nickvergessen
Copy link
Member

It will only backport after the PR was merged, which will not be during the current RC freeze

@Altahrim Altahrim mentioned this pull request Apr 24, 2024
Merged
@nfebe nfebe enabled auto-merge April 30, 2024 09:54
This was referenced Apr 30, 2024
Merged
Merged
@nfebe nfebe force-pushed the backport/44838/stable28 branch 2 times, most recently from 1539611 to 1cf2bed Compare April 30, 2024 16:21
This was referenced May 15, 2024
Merged
Merged
@skjnldsv
Copy link
Member

skjnldsv commented Jun 7, 2024

@nickvergessen what's the status, is this good for you?

@nickvergessen
Copy link
Member

With the last commit it should be okay. But I heard something broke in one of the other backports and had to be refixed between RC1 and RC2, so maybe @ShGKme or @fenn-cs can confirm this does not happen here

@nfebe
Copy link
Contributor

nfebe commented Jun 7, 2024 •
edited
Loading

@nickvergessen That has been handled here : #45604

@nfebe nfebe force-pushed the backport/44838/stable28 branch from 1cf2bed to 9237d4c Compare June 7, 2024 12:00
nfebe added 2 commits June 10, 2024 09:08
@nfebe
refactor(shareApiController): use contrusctor property promotion & DI…
30900ae 
… logger

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
@nfebe
fix(shareApiController): avoid duplicated expiryDate operations
3c50777 
`expireDate` can be set once and used anywhere needed, the current implementation,

duplicates this behavior which leads to `parseDate` receiving an a date object it

parsed and returend earlier in the createShare method.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
@nfebe nfebe force-pushed the backport/44838/stable28 branch from 9237d4c to e8b7a4b Compare June 10, 2024 08:08
@nickvergessen @nfebe
fix(sharing): Don't change the type of the controller argument
4d748b9 
[EA] New value type (\DateTime) is not matching the resolved parameter type and might introduce types-related false-positives.

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
@nfebe nfebe force-pushed the backport/44838/stable28 branch from e8b7a4b to 4d748b9 Compare June 10, 2024 08:10
@skjnldsv skjnldsv disabled auto-merge June 11, 2024 07:44
@skjnldsv skjnldsv merged commit 436663f into stable28 Jun 11, 2024
53 of 54 checks passed
@skjnldsv skjnldsv deleted the backport/44838/stable28 branch June 11, 2024 07:44
@backportbot backportbot bot mentioned this pull request Jun 11, 2024
Closed
2 tasks
@blizzz blizzz mentioned this pull request Jun 11, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Altahrim Altahrim Altahrim approved these changes

@artonge artonge artonge approved these changes

@nfebe nfebe nfebe approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees

@nfebe nfebe

Labels
3. to review Waiting for reviews feature: sharing
Projects
None yet
Milestone
Nextcloud 28.0.7
Development

Successfully merging this pull request may close these issues.
6 participants
@nfebe @nickvergessen @skjnldsv @Altahrim @artonge @AndyScherzinger