Skip to content

Conversation

@AndyXheli
Copy link

Fix for #1271

@artonge please review

Signed-off-by: Andy Xheli [email protected]

Fix for #1271

Signed-off-by: Andy Xheli <[email protected]>
@AndyXheli AndyXheli changed the title Update CollaboratorsSelectionForm.vue Fix Scroll under add collaborators Oct 3, 2022
@artonge
Copy link
Collaborator

artonge commented Oct 4, 2022

/compile amend /

@AndyXheli
Copy link
Author

@artonge All set!

@artonge
Copy link
Collaborator

artonge commented Oct 4, 2022

/compile amend /

@artonge
Copy link
Collaborator

artonge commented Oct 5, 2022

Hey @AndyXheli could you compile and squash ? I can't do it as your branch is on your repository

@AndyXheli

This comment was marked as outdated.

@artonge
Copy link
Collaborator

artonge commented Oct 5, 2022

Hey! I think i did it. If not can you please let me know how ?

npm ci
npm run build
git add .
git commit --amend
git push --force

@AndyXheli

This comment was marked as outdated.

@artonge
Copy link
Collaborator

artonge commented Oct 5, 2022

Can you check your npm version ? It should be 7 or above

@AndyXheli

This comment was marked as outdated.

@AndyXheli

This comment was marked as outdated.

@artonge
Copy link
Collaborator

artonge commented Oct 6, 2022

Weird, as you already force pushed on this branch without any issue. Anyway, you can push normally, without --force. Don't forget to create a new commit, I don't see this step in your shell output

Fix scroll

Signed-off-by: Andy Xheli <[email protected]>
@AndyXheli
Copy link
Author

@artonge I got it! Thank you for your support :) Please review

@artonge
Copy link
Collaborator

artonge commented Oct 6, 2022

Great ! Could you tell me what was blocking ? Just to know for next time.

@AndyXheli
Copy link
Author

Great ! Could you tell me what was blocking ? Just to know.

All I did was delete the photos folder from my computer then i when into my ford redownload it then did a

gh pr checkout 1312
npm ci
npm run build
git add .
git commit --amend
git push --force

and i didnt get the error. Maybe i was doing something wrong ?

@artonge artonge merged commit 056b3a3 into nextcloud:master Oct 6, 2022
@AndyXheli AndyXheli deleted the patch-2 branch October 6, 2022 17:41
@artonge
Copy link
Collaborator

artonge commented Oct 6, 2022

/backport to stable25

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request Pending backport by the backport-bot label Oct 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-request Pending backport by the backport-bot

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants