Skip to content

[Fix]: scan-app-data conversion - #35935

Merged
szaimen merged 1 commit into
nextcloud:masterfrom
EWouters:patch-1
Jan 23, 2023
Merged

[Fix]: scan-app-data conversion#35935
szaimen merged 1 commit into
nextcloud:masterfrom
EWouters:patch-1

Conversation

@EWouters

@EWoutersEWouters commented Jan 1, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.

See #34283 (comment)
and #35935 (comment).

Closes#34283.

Co-authored-by: Richard Steinmetz richard@steinmetz.cloud
Signed-off-by: EWouters 6179932+EWouters@users.noreply.github.com

Summary

Checklist

@szaimenszaimen added this to the Nextcloud 26 milestone Jan 1, 2023
@szaimenszaimen added the 3. to review Waiting for reviews label Jan 1, 2023
@szaimen
szaimen requested review from a team, ArtificialOwl, ChristophWurst, blizzz and icewind1991 and removed request for a teamJanuary 1, 2023 21:28
github-advanced-security[bot]
github-advanced-securityAI found potential problems Jan 1, 2023
View reviewed changes
Comment threadapps/files/lib/Command/ScanAppData.php Fixed
Comment threadapps/files/lib/Command/ScanAppData.php Fixed
st3iny
st3iny reviewed Jan 2, 2023
View reviewed changes
Comment threadapps/files/lib/Command/ScanAppData.php Outdated
@come-nc

come-nc commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Superseeded by #32059

@come-nccome-nc closed this Jan 2, 2023
@st3iny

st3iny commented Jan 2, 2023

Copy link
Copy Markdown
Member

Superseeded by #32059

No. This is about apps/files/lib/Command/ScanAppData.php. You linked the PR that fixed apps/files/lib/Command/Scan.php.

@st3inyst3iny reopened this Jan 2, 2023
@come-nc

come-nc commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Sorry about that

@EWouters

EWouters commented Jan 3, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Should I squash and force push or it it fine like this?

(I used only the browser and my phone for these changes 🤓 (and I tested them locally))

@st3iny

st3iny commented Jan 3, 2023

Copy link
Copy Markdown
Member

Should I squash and force push or it it fine like this?

(I used only the browser and my phone for these changes 🤓 (and I tested them locally))

Please squash your commits.

@EWouters@st3iny
[Fix]: scan-app-data conversion
3a9173c
Adapted from sugestions by @Hiyoal in nextcloud#34283 and @st3iny in nextcloud#35935.
See nextcloud#34283 (comment)
and nextcloud#35935 (comment).
Closesnextcloud#34283.
Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
@EWouters

EWouters commented Jan 3, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Not sure if this is CI flakes:

From https://github.com/EWouters/server * branch patch-1 -> FETCH_HEAD * [new branch] patch-1 -> pr/patch-1warning: 9d07ec5a96d7995785f6d3d377024ba09977cb91:.gitmodules, multiple configurations found for 'submodule.3rdparty.path'. Skipping second one!warning: 9d07ec5a96d7995785f6d3d377024ba09977cb91:.gitmodules, multiple configurations found for 'submodule.3rdparty.url'. Skipping second one!Fetching submodule 3rdpartyfatal: remote error: upload-pack: not our ref 03c3817ff132653c794fd04410977952f69fd614Errors during submodule fetch:	3rdpartyError: Process completed with exit code 1.

I can't change the name of the branch without opening a new PR, or is that not the problem?

Edit: Is CI perhaps not compatible with the Github CLI utility?

@st3iny

st3iny commented Jan 4, 2023•
edited
Loading

Copy link
Copy Markdown
Member

I restarted failed tests. This might be a transient failure.

st3iny
st3iny approved these changes Jan 5, 2023
View reviewed changes

@st3inyst3iny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM! Cypress failures are unrelated.

@st3iny

st3iny commented Jan 5, 2023

Copy link
Copy Markdown
Member

/backport to stable25

@st3iny

st3iny commented Jan 5, 2023

Copy link
Copy Markdown
Member

/backport to stable24

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 12, 2023
@st3inyst3iny mentioned this pull request Jan 23, 2023
Closed
9 tasks
@st3iny
st3iny requested a review from szaimenJanuary 23, 2023 16:03
@st3iny
st3iny requested a review from PVince81January 23, 2023 16:03
@szaimen
szaimen merged commit 078203a into nextcloud:masterJan 23, 2023
@welcome

welcomeBot commented Jan 23, 2023

Copy link
Copy Markdown

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Jan 23, 2023
Merged
backportbot-nextcloudBot pushed a commit that referenced this pull request Jan 23, 2023
@EWouters@st3iny@backportbot-nextcloud
[Fix]: scan-app-data conversion
66ccaa4
Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.
See #34283 (comment)
and #35935 (comment).
Closes#34283.
Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
@szaimen

szaimen commented Jan 24, 2023

Copy link
Copy Markdown
Contributor

/backport to stable24

@st3inyst3iny mentioned this pull request Jan 24, 2023
Closed
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Jan 24, 2023
Merged
backportbot-nextcloudBot pushed a commit that referenced this pull request Jan 24, 2023
@EWouters@st3iny@backportbot-nextcloud
[Fix]: scan-app-data conversion
75e2431
Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.
See #34283 (comment)
and #35935 (comment).
Closes#34283.
Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
@bigbekabigbeka mentioned this pull request Feb 23, 2023
Closed
@EWouters
EWouters deleted the patch-1 branch March 3, 2023 17:30
@MahdiBaghbaniMahdiBaghbani mentioned this pull request Apr 25, 2023
Draft
s8321414 pushed a commit to MODAODF/odfweb that referenced this pull request May 4, 2023
@EWouters@st3inytony
[Fix]: scan-app-data conversion
4bc6b90
Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.
See nextcloud/server#34283 (comment)
and nextcloud/server#35935 (comment).
Closes #34283.
Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@st3inyst3inyst3iny approved these changes
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwlArtificialOwl is a code owner automatically assigned from nextcloud/server-backend
@icewind1991icewind1991Awaiting requested review from icewind1991icewind1991 is a code owner automatically assigned from nextcloud/server-backend
@blizzzblizzzAwaiting requested review from blizzzblizzz is a code owner automatically assigned from nextcloud/server-backend
@szaimenszaimenAwaiting requested review from szaimen
@PVince81PVince81Awaiting requested review from PVince81
+1 more reviewer
@HiyoalHiyoalHiyoal left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

[Bug]: scan-app-data conversion

8 participants

@EWouters@come-nc@st3iny@szaimen@ChristophWurst@Hiyoal@github-advanced-security@skjnldsv