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.

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

try to fix regression with public file upload button #39916

Merged
merged 1 commit into from
Aug 16, 2023

Conversation

szaimen
Copy link
Contributor

@szaimen szaimen commented Aug 16, 2023

On public link shares where files are editable, there the add button is broken after #39884. Fix this:

Before After
image image

@szaimen szaimen added this to the Nextcloud 28 milestone Aug 16, 2023
@szaimen szaimen force-pushed the enh/noid/fix-public-file-upload-button branch from 404b1b6 to 6226765 Compare August 16, 2023 16:31
@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 16, 2023
@szaimen szaimen marked this pull request as ready for review August 16, 2023 16:31
@szaimen
Copy link
Contributor Author

szaimen commented Aug 16, 2023

/backport to stable27

@szaimen szaimen requested review from jancborchardt, AndyScherzinger, susnux, a team, artonge and Pytal and removed request for a team August 16, 2023 16:31
@szaimen
Copy link
Contributor Author

szaimen commented Aug 16, 2023

btw @susnux the file/folder picker does not seem to work on public link shares currently... Or is it not merged yet?

@szaimen
Copy link
Contributor Author

szaimen commented Aug 16, 2023

/compile amend /

Signed-off-by: Simon L <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@nextcloud-command nextcloud-command force-pushed the enh/noid/fix-public-file-upload-button branch from 6226765 to 372f9c9 Compare August 16, 2023 16:54
@susnux
Copy link
Contributor

susnux commented Aug 16, 2023

@szaimen

the file/folder picker does not seem to work on public link shares currently... Or is it not merged yet?

Not merged for master currently.

@szaimen
Copy link
Contributor Author

szaimen commented Aug 16, 2023

@szaimen

the file/folder picker does not seem to work on public link shares currently... Or is it not merged yet?

Not merged for master currently.

all right 👍

@susnux susnux merged commit 3ff9e72 into master Aug 16, 2023
@susnux susnux deleted the enh/noid/fix-public-file-upload-button branch August 16, 2023 21:38
@backportbot-nextcloud
Copy link

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

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@susnux
Copy link
Contributor

susnux commented Aug 16, 2023

/backport to stable27

@backportbot-nextcloud
Copy link

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

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@susnux
Copy link
Contributor

susnux commented Aug 16, 2023

/backport 6226765 to stable27

@backportbot-nextcloud
Copy link

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

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@szaimen szaimen restored the enh/noid/fix-public-file-upload-button branch August 16, 2023 22:38
@szaimen szaimen deleted the enh/noid/fix-public-file-upload-button branch August 16, 2023 22:41
@szaimen
Copy link
Contributor Author

szaimen commented Aug 17, 2023

#39921

@nickvergessen
Copy link
Member

@susnux @szaimen

If there is compiled JS backporting mostly never works.

You can help yourself by having the compiling in another commit, by using /compile / (without the amend) and then only requesting the backport bot to backport the source code change only /backport <commit sha> to stable27. After the backport is done, you do /compile / there again.

@susnux
Copy link
Contributor

susnux commented Aug 17, 2023

@nickvergessen the last of my requests did not contain any compiled assets but still failed.

@nickvergessen
Copy link
Member

Yeah sorry, it contains compiled CSS not JS. but same problem. all the scss files are reduced to a single line. so conflicts are just going to happen.
But also for compiled CSS the mentioned "trick" works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants