Skip to content

[stable10] Create new method for uploading file with headers#33787

Merged
phil-davis merged 1 commit into
stable10from
stable10-upload-file-method
Dec 7, 2018
Merged

[stable10] Create new method for uploading file with headers#33787
phil-davis merged 1 commit into
stable10from
stable10-upload-file-method

Conversation

@dpakach

@dpakach dpakach commented Dec 6, 2018

Copy link
Copy Markdown
Contributor

Backport for #33784

@dpakach dpakach self-assigned this Dec 6, 2018
@phil-davis phil-davis changed the title Create new method for uploading file with headers [stable10] Create new method for uploading file with headers Dec 6, 2018
@phil-davis

Copy link
Copy Markdown
Contributor

@ownclouders rebase

@ownclouders

Copy link
Copy Markdown
Contributor

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@ownclouders

Copy link
Copy Markdown
Contributor

Automated rebase with GitMate.io was successful! 🎉

@phil-davis
phil-davis force-pushed the stable10-upload-file-method branch from 27ef8a1 to 7672a54 Compare December 6, 2018 12:28
@phil-davis

Copy link
Copy Markdown
Contributor

The auto-rebase was a NOOP. I locally rebased and force-pushed. drone has triggered a job now.

@phil-davis
phil-davis force-pushed the stable10-upload-file-method branch from 7672a54 to d63de43 Compare December 6, 2018 15:57
@phil-davis

Copy link
Copy Markdown
Contributor

@dpakach conflicts to resolve
Note: I also fixed a php-cs-fixer code style error last night, so make sure to pull the latest branch from github first.

@dpakach
dpakach force-pushed the stable10-upload-file-method branch from d63de43 to 902e569 Compare December 7, 2018 05:25
@phil-davis

Copy link
Copy Markdown
Contributor

@dpakach it still says there are conflicts

@dpakach
dpakach force-pushed the stable10-upload-file-method branch from 902e569 to de30633 Compare December 7, 2018 05:38
@phil-davis
phil-davis merged commit 0ab4fad into stable10 Dec 7, 2018
@delete-merged-branch
delete-merged-branch Bot deleted the stable10-upload-file-method branch December 7, 2018 09:17
@lock lock Bot locked as resolved and limited conversation to collaborators Dec 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants