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

[stable21] improve status modal #30454

Merged
merged 2 commits into from
Jan 8, 2022
Merged

[stable21] improve status modal #30454

merged 2 commits into from
Jan 8, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 30, 2021 •
edited by szaimen
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #30420

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.8 milestone Dec 30, 2021
@szaimen
improve status modal
2323fd1 
Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@szaimen szaimen force-pushed the backport/30420/stable21 branch from 5cd2bee to 2323fd1 Compare December 30, 2021 23:43
@szaimen
Copy link
Contributor

szaimen commented Dec 30, 2021

/compile amend /

@szaimen
Copy link
Contributor

szaimen commented Dec 30, 2021

Seems like the compile bot fails again because it uses npm version 16...

This was referenced Jan 7, 2022
Merged
Merged
@skjnldsv skjnldsv added the 2. developing Work in progress label Jan 7, 2022
@szaimen
Copy link
Contributor

szaimen commented Jan 7, 2022

/compile amend /

@MichaIng
Copy link
Member

MichaIng commented Jan 7, 2022

You managed it by bumping npm/node temporarily, right? Is this assured to not cause webpack diffs when reverting npm/node? Or is the current diff in tests even a result of this 🤔? So maybe it needs to be bumped permanently?

@szaimen
Copy link
Contributor

szaimen commented Jan 7, 2022

So maybe it needs to be bumped permanently?

Probably yes but to which version? Node 12 with npm 6?

@MichaIng
Copy link
Member

MichaIng commented Jan 7, 2022

14/7 worked before, but if 12/6 works as well then it is probably better to bump it as little as possible.

@szaimen
Copy link
Contributor

szaimen commented Jan 8, 2022

/compile amend /

@szaimen @nextcloud-command
fix compiling
a1fc749 
Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
szaimen
szaimen approved these changes Jan 8, 2022
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.

I changed the engines in package.json now to

    "node": "^12.0.0",
    "npm": "^6.0.0"

Seems like it works now :)

@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 8, 2022
@szaimen szaimen 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 8, 2022
@szaimen
Copy link
Contributor

szaimen commented Jan 8, 2022

Static code analysis / static-code-analysis-ocp (pull_request) failure unrelated

@szaimen szaimen merged commit 62a9fd5 into stable21 Jan 8, 2022
@szaimen szaimen deleted the backport/30420/stable21 branch January 8, 2022 10:41
@blizzz blizzz mentioned this pull request Jan 14, 2022
Merged
This was referenced Jan 20, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@szaimen szaimen szaimen approved these changes

@artonge artonge Awaiting requested review from artonge

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

@nimishavijay nimishavijay Awaiting requested review from nimishavijay

@PVince81 PVince81 Awaiting requested review from PVince81

@Pytal Pytal Awaiting requested review from Pytal

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement feature: status
Projects
None yet
Milestone
Nextcloud 21.0.8
Development

Successfully merging this pull request may close these issues.
3 participants
@szaimen @MichaIng @skjnldsv