Merged
Conversation
…-types # Conflicts: # packages/rocketchat-lib/package.js
…-types # Conflicts: # packages/rocketchat-file-upload/server/config/configFileUploadAmazonS3.js # packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json # packages/rocketchat-lib/package.js # packages/rocketchat-lib/server/functions/setUsername.coffee # packages/rocketchat-lib/server/models/Uploads.coffee # packages/rocketchat-ui-account/client/avatar/prompt.coffee # packages/rocketchat-ui/client/lib/fileUpload.coffee
rodrigok
force-pushed
the
new-avatar-storage-types
branch
from
eb5b337 to
6eb06e6
Compare
rodrigok
force-pushed
the
new-avatar-storage-types
branch
from
2401c67 to
e14e73d
Compare
…-types # Conflicts: # packages/rocketchat-importer/server/classes/ImporterBase.coffee
…-types # Conflicts: # server/startup/migrations/v096.js
rodrigok
changed the title
rodrigok
approved these changes
Jun 1, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
@RocketChat/core
This PR will change avatar storage type to use the same as file uploads, so all different storage types will available for both:
RocketChatFileAvatarInstanceNot important
Closes #3480
Doc
There will be 4 types of stores:
And 2 types of uploads
The upload store is a combination of both (store and upload types), like
AmazonS3:Uploads, but to prevent the need to know the current active store there are 2 fake stores that point to current ones:If you upload pointing to
Uploadsthe file will be saved to the current store as a upload type.Backwards compatibility
The old store names
fileSystemandgridFSare still supported but deprecated.The direct uploads to
s3andgoogleCloudStorageare still supported but deprecated.