Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Sep 26, 2022

  • ⚠️ This backport had conflicts and is incomplete

backport of #34260

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25 milestone Sep 26, 2022
@PVince81 PVince81 force-pushed the backport/34260/stable25 branch from f22539a to 1342ca3 Compare September 26, 2022 20:52
@PVince81 PVince81 self-assigned this Sep 26, 2022
@PVince81 PVince81 added the 3. to review Waiting for reviews label Sep 26, 2022
@nickvergessen
Copy link
Member

CONFLICT (content): Merge conflict in package-lock.json

@nickvergessen
Copy link
Member

Please redo

@blizzz blizzz mentioned this pull request Sep 27, 2022
@blizzz blizzz added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 27, 2022
@PVince81
Copy link
Member

rm -Rf node_modules && npm remove @vue/cli-plugin-unit-jest vue-jest --force && npm install "jest@29" "jest-environment-jsdom@29" "@vue/vue2-jest" "babel-jest" && npm run test

@PVince81 PVince81 force-pushed the backport/34260/stable25 branch from 1342ca3 to be49501 Compare September 27, 2022 08:28
@PVince81

This comment was marked as outdated.

It was causing issues during dependency upgrades and wasn't really used
except for its preset definition.

Signed-off-by: Vincent Petry <[email protected]>
@PVince81 PVince81 force-pushed the backport/34260/stable25 branch from be49501 to bc9f3d3 Compare September 27, 2022 08:45
@PVince81
Copy link
Member

rebased and redone

@nickvergessen nickvergessen removed their request for review September 27, 2022 09:26
@PVince81
Copy link
Member

@nickvergessen please review and merge ?

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.

🐘

@nickvergessen nickvergessen merged commit 2d86948 into stable25 Sep 27, 2022
@nickvergessen nickvergessen deleted the backport/34260/stable25 branch September 27, 2022 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2. developing Work in progress

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants