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

Fix settings chunk loading #22395

Merged
merged 2 commits into from
Sep 10, 2020
Merged

Fix settings chunk loading #22395

merged 2 commits into from
Sep 10, 2020

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Aug 24, 2020 •
edited
Loading

Potentially fix #21024

Avoid files conflict when building and try to fix weird webpack chunk loading issue.

@skjnldsv skjnldsv self-assigned this Aug 24, 2020
@skjnldsv skjnldsv added this to the Nextcloud 20 milestone Aug 24, 2020
@skjnldsv skjnldsv mentioned this pull request Aug 24, 2020
Closed
@skjnldsv skjnldsv marked this pull request as ready for review August 25, 2020 06:31
@skjnldsv skjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 25, 2020
This was referenced Aug 25, 2020
Merged
Merged
@skjnldsv skjnldsv force-pushed the fix/settings-chunks branch from 3a36db1 to d6d2c6b Compare August 29, 2020 08:29
@skjnldsv skjnldsv force-pushed the fix/settings-chunks branch from d6d2c6b to c16ef0f Compare August 29, 2020 08:38
@skjnldsv
Copy link
Member Author

/backport to stable19

@skjnldsv
Copy link
Member Author

/backport to stable18

@skjnldsv skjnldsv requested a review from nickvergessen August 29, 2020 08:40
@rullzer rullzer mentioned this pull request Sep 3, 2020
Merged
13 tasks
MorrisJobke
MorrisJobke approved these changes Sep 10, 2020
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 10, 2020
@MorrisJobke
Copy link
Member

@skjnldsv Mind to rebase and recreate?

@faily-bot

This comment has been minimized.

Sign in to view
@skjnldsv
Copy link
Member Author

Aaaand, it's outdated again --'

@MorrisJobke
Copy link
Member

I guess it doesn't make sense to rebase now. First #22635 should get in and then we rebase this again.

@MorrisJobke
Copy link
Member

I guess it doesn't make sense to rebase now. First #22635 should get in and then we rebase this again.

I was afraid of the conflicts.

@skjnldsv Mind to do a last one and we merge this next?

cc @rullzer

@skjnldsv
Fix settings chunk loading
a6d343b 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Compile assets
b8c3ee5 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv merged commit be9dde8 into master Sep 10, 2020
@skjnldsv skjnldsv deleted the fix/settings-chunks branch September 10, 2020 17:19
@backportbot-nextcloud
Copy link

The backport to stable19 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable18 failed. Please do this backport manually.

@rullzer rullzer mentioned this pull request Sep 11, 2020
Merged
5 tasks
@MorrisJobke
Copy link
Member

The backport to stable19 failed. Please do this backport manually.

@skjnldsv mind to do this manually?

@skjnldsv skjnldsv mentioned this pull request Sep 18, 2020
Merged
@skjnldsv
Copy link
Member Author

Done

@skjnldsv skjnldsv mentioned this pull request Sep 18, 2020
Merged
@Pytal Pytal mentioned this pull request Jul 28, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@georgehrke georgehrke Awaiting requested review from georgehrke

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees

@skjnldsv skjnldsv

Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: settings
Projects
None yet
Milestone
Nextcloud 20
Development

Successfully merging this pull request may close these issues.

Apps and Users pages are showing a blank white screen on Migrated Instance
3 participants
@skjnldsv @MorrisJobke @juliusknorr