Conversation
fixed a typo
jmscraig
added a commit
to jmscraig/Rocket.Chat
that referenced
this pull request
Sep 2, 2018
…ue with composite index ee97ee9" Merge of this commit involved acceptace of simple additions from both sides, with no real conflicts. Two changes made to createDirectMessage via this commit. 1. ES6 linting was balking badly about lack of spacing in line RocketChat#48 so added spacing until linting was happy. 48 const rid = `${ [me._id, to._id].sort().join('') }_${ team }`; 2. This text was added to line 65 65 name: [me._id, to._id].sort().join(''), Original commit had 1 file. Original Rocket.Chat for teams commit written by Marc Enriquez (h--ps://github.com/auterium) (cherry picked from commit ee97ee9)
jmscraig
added a commit
to jmscraig/Rocket.Chat
that referenced
this pull request
Sep 4, 2018
…v69.1 Merges were originally carefully git cherry-picked to show 1 to 1 linage with Marc's original four commits. The merge is leaner and less risky to do at once as a rebase so has been combined to one merge commit. Descriptions of the changes can be seen below .. I pasted in the text of the first four cherry-picks that individually pulled Marcs commits forward. commit 79a9af4 Author: James Craig <cobratxt-jcraig@yahoo.com> Date: Thu Aug 30 14:06:53 2018 -0500 Merge of "Add name to room creation of direct messages to prevent issue with composite index ee97ee9" Merge of this commit involved acceptace of simple additions from both sides, with no real conflicts. Two changes made to createDirectMessage via this commit. 1. ES6 linting was balking badly about lack of spacing in line RocketChat#48 so added spacing until linting was happy. 48 const rid = `${ [me._id, to._id].sort().join('') }_${ team }`; 2. This text was added to line 65 65 name: [me._id, to._id].sort().join(''), Original commit had 1 file. Original Rocket.Chat for teams commit written by Marc Enriquez (h--ps://github.com/auterium) (cherry picked from commit ee97ee9) commit 5ca1079 Author: James Craig <cobratxt-jcraig@yahoo.com> Date: Thu Aug 30 13:50:27 2018 -0500 Merge Update on "Merge branch 'develop' into RC feature/teams 58c4e0a" Review needed on Resolution Choices for Merge Conflicts and validation that no major remaining issues need to be addressed by the updates from the Rocket.Chat Origin upgrade. Need to Review changes to and clarify and version or ENV configuration dependencies TT RC-Teams has on HISTORY.md, Dockerfile and config.yml These two files were split off for further review. both modified: packages/rocketchat-i18n/i18n/vi-VN.i18n.json feature/teams modified: Rocket.Chat\packages\rocketchat-integrations\server\api\api.js Full list of Merge conflicts: both modified: .circleci/config.yml both modified: .docker/Dockerfile both modified: .sandstorm/sandstorm-pkgdef.capnp both modified: .travis/snap.sh both modified: package.json both modified: packages/rocketchat-api/server/api.js both modified: packages/rocketchat-i18n/i18n/vi-VN.i18n.json both modified: packages/rocketchat-lib/rocketchat.info Original 58c4e0a had 11 files. Original Rocket.Chat for teams commit written by Marc Enriquez h--ps://github.com/auterium (cherry picked from commit 58c4e0a) commit 6599049 Author: James Craig <cobratxt-jcraig@yahoo.com> Date: Thu Aug 30 11:49:03 2018 -0500 Merge Update RC-teams - Subscriptions.js from "Add basic support for teams" 7a0e697 Review needed on Resolution Choices for Merge Conflicts and validation that no major remaining issues need to be addressed by the updates from the Rocket.Chat Origin upgrade. Subscriptions.js was the most difficult file to merge so was split from the larger original commit. The intent was to just merge 'team' functionality was just merged into the existing Subscriptions.js file with no changes to existing logic. Changes to the way teams using mongo indexes and chaching took place. See these comments in the js file. // James Craig - Aug 30 2018 Merge Changes - RC-dev deleted this row for a bug fix // and this index will be a performance hit at scale. // - this.tryEnsureIndex({ 'u._id': 1, 'name': 1, 't': 1, 'code': 1, 'team': 1 }, { unique: 1 }); // Replaced with this row. Check uniqueness team creation runtime. // + this.tryEnsureIndex({ team: 1 }, { sparse: 1 }); // James Craig - Aug 30 2018 Merge Changes - Allowed removal of cache index // Timed with a major MondoDB upgrade RC-dev branched removed all this.cache.ensureIndex() // I allowed removal of this row. // - this.cache.ensureIndex(['name', 'team', 'u._id'], 'unique'); Original Rocket.Chat for teams commit written by Marc Enriquez (https://github.com/auterium). (cherry picked from commit 7a0e697) commit d1599b2 Author: James Craig <cobratxt-jcraig@yahoo.com> Date: Thu Aug 30 08:49:59 2018 -0500 Merge Update RC-teams "Add basic support for teams" 7a0e697 Merge Update RC-teams "Add basic support for teams" 7a0e697 Review needed on Resolution Choices for Merge Conflicts and validation that no major remaining issues need to be addressed by the updates from the Rocket.Chat Origin upgrade. Most Significant Merge Conflicts server/models/rooms.js, RocketChat.ErrorHandler.js, server/startup/initialData.js Logic changes in need of confirmation rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js Full list of Merge conflicts: both modified: packages/rocketchat-apps/server/bridges/rooms.js both modified: packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js both modified: packages/rocketchat-lib/server/functions/createRoom.js both modified: packages/rocketchat-lib/server/models/Subscriptions.js both modified: packages/rocketchat-ui-sidenav/client/roomList.js both modified: server/methods/createDirectMessage.js both modified: server/publications/room.js both modified: server/startup/initialData.js Original 7a0e697 had 35 files. Original Rocket.Chat for teams commit written by Marc Enriquez (h--ps://github.com/auterium). (cherry picked from commit 7a0e697)
jmscraig
added a commit
to jmscraig/Rocket.Chat
that referenced
this pull request
Sep 4, 2018
…ue with composite index ee97ee9"
Author: James Craig <cobratxt-jcraig@yahoo.com>
Date: Thu Aug 30 14:06:53 2018 -0500
Merge of "Add name to room creation of direct messages to prevent issue with composite index ee97ee9"
Merge of this commit involved acceptace of simple additions from both sides, with no real conflicts.
Two changes made to createDirectMessage via this commit.
1. ES6 linting was balking badly about lack of spacing in line RocketChat#48 so added spacing until linting was happy.
48 const rid = `${ [me._id, to._id].sort().join('') }_${ team }`;
2. This text was added to line 65
65 name: [me._id, to._id].sort().join(''),
Original commit had 1 file.
Original Rocket.Chat for teams commit written by Marc Enriquez (h--ps://github.com/auterium)
(cherry picked from commit ee97ee9)
jmscraig
pushed a commit
to jmscraig/Rocket.Chat
that referenced
this pull request
Sep 7, 2018
…ue with composite index ee97ee9" Merge of this commit involved acceptace of simple additions from both sides, with no real conflicts. One Two changes made to createDirectMessage via this commit. 1. ES6 linting was balking badly about lack of spacing in line RocketChat#48 so added spacing until linting was happy. 48 const rid = `${ [me._id, to._id].sort().join('') }_${ team }`; 2. This text was added to line 65 65 name: [me._id, to._id].sort().join(''), Original commit had 1 file. Original Rocket.Chat for teams commit written by Marc Enriquez (h--ps://github.com/auterium) (cherry picked from commit ee97ee9) (cherry picked from commit 79a9af4)
This was referenced May 25, 2021
Closed
Closed
Merged
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
2 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.
fixed a typo