Imports controller errors #1553
Merged
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
mjankowski
force-pushed
the
imports-controller-errors
branch
2 times, most recently
from
8e6961f
to
f29cc25
Compare
|
That PR itself was a fix. This would revert the fix. Can we instead have some sort of solution that fixes both cases, both when files are stored locally, and when they are stored in the cloud? |
|
I didn't understand that original commit at first, but I see now it was handling the remote file storage (S3 or similar) situation. I can update this to handle either remote or local file storage and preserve the prior fix. |
mjankowski
force-pushed
the
imports-controller-errors
branch
from
f29cc25
to
592c623
Compare
|
This has been updated in a way where I think it preserves the cloud storage fix, and fixes the local storage breakage. |
mjankowski
force-pushed
the
imports-controller-errors
branch
from
592c623
to
07fb4a1
Compare
Gargron
approved these changes
Apr 11, 2017
Nyoho
referenced
this pull request
in Nyoho/mathtodon
Apr 25, 2017
* Add spec for settings/imports controller * Add failing spec for settings/imports#create * Fix broken imports * Refactor ImportWorker
ClearlyClaire
added a commit
to ClearlyClaire/mastodon
that referenced
this pull request
Jun 24, 2021
…upstream Merge upstream changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #1540
The changes in e30bbb1 broke the import functionality.
This rolls back those changes, and adds a spec which will fail if they are broken again.