This repository has been archived by the owner on Apr 18, 2020. It is now read-only.
Update our fork #2
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix behaviour when asset_host is set
Allow to use webdav storage as cache storage
carrierwave-webdav/lib/carrierwave/httparty_monkey.rb:10: warning: already initialized constant HTTParty::Request::SupportedHTTPMethods httparty-0.13.7/lib/httparty/request.rb:3: warning: previous definition of SupportedHTTPMethods was here
tmartyny
requested review from
FeminismIsAwesome,
jakeonfire and
franckverrot
|
I believe you've merged instead of rebasing, which is why we see 19 commits here I presume. Do you intend to run a long-running branch on this one? Or are we using |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey folks,
I'm starting the process of rebasing onto the upstream repo. They moved the file class into its own file. So I updated that file with Ian's changes. Do we have a process we follow for updating forks? We should at minimum test out pointing a branch from our repos at this branch build and make sure files still upload to OwnCloud properly.
The merge needs to be tweaked. For some reason I resolved the merge conflict locally, it all looks great, I force pushed and all... and the repo won't pick up my changes. /shrug. But let's start with even seeing if it works.