[FIX] Typo in a configuration key for SlackBridge excluded bot names#11872
Merged
sampaiodiego merged 1 commit intoRocketChat:developfrom Sep 3, 2018
Merged
Conversation
The code looked for the key `SlackBridge_Botnames`, which is not referenced anywhere else. Instead, it now looks for the key `SlackBridge_ExcludeBotnames`.
Hudell
approved these changes
Aug 27, 2018
sampaiodiego
changed the title
jmscraig
added a commit
to jmscraig/Rocket.Chat
that referenced
this pull request
Sep 7, 2018
…velop into ttrc-teams-mgh-v69-02-01 SCOPE: This commit is work to sync / bring forward / update the TT Rocket.Chat teams code with current HEAD of the Rocket.Chat/develop branch. The RocketChat feature/teams branch is nearly 900 commits behind it's upstream tracking source RocketChat/develop so this will just be the first in a series of commits. This large first commit includes a a good portion of inbound changes from 646 upsteam commits with physical changes to 1817 files. TT RC Upgrade MERGE STRATEGY: After a number of expeirments I decided this Merge was a better strategy than rebase because we dont care as much about all the changes in the primary Rocket.Chat devlop branch timeline. Rebase -p would be better if we owned the main branch, but leaves complex feature/branches with a big loss in change history. For TT this merge strategy was chosen better because it better maintains the linage how WE want to see it. # $ git merge -s recursive -X patience --no-commit --no-ff --stat --log --verbose upstream/develop This merge strategy provides the clearest picture I have seen yet for: 1) What is Newer - what is different in the main Dev Branch after Marc forked it. Will create a clear picture all changes we make to the code after this first major release by Marc. 2) Current, Base State. What is a Clear Picture of the code as Marc has designed. ( This option best shows what Changes and improvements Marc decided to introduce.) 3) Older, Pre-Marc. Shows what Changes Marc made to diverge from the original, who's code and earlier commits he changed. Lowers our risk.. SOURCE: This RocketChat feature/teams code was written by Marc Enriquez (https://github.com/auterium) and submitted in the four following commits. Change roomId generation to prevent issues with jitsi 7572135 h--ps://github.com/RocketChat/Rocket.Chat/commit/7572135e1f1c60ee19d64d13f73cd2c03d0de675 Add name to room creation of direct messages to prevent issue ee97ee9 h--ps://github.com/RocketChat/Rocket.Chat/commit/ee97ee944c5682d77ff739b2de7b62cfe21d39db Merge branch 'develop' into feature/teams 58c4e0a h--ps://github.com/RocketChat/Rocket.Chat/commit/58c4e0a2d3757cd3c6887a6beb9d40befe4ba2d9 Add basic support for teams 7a0e697 h--ps://github.com/RocketChat/Rocket.Chat/commit/7a0e697215ee131c540c5191b204243a893e059c * Source of these changes is 646 commits from the default RocketChat/develop branch. [IMPROVE] Refactoring the snap backup scripts to improve UX [FIX] Close popover on shortcuts and writing (RocketChat#11562) [BREAK] Update the default port of the Prometheus exporter (RocketChat#11351) [FIX] Missing `fname` property in Livechat rooms (#11849_ [FIX] Typo in a configuration key for SlackBridge excluded bot names (RocketChat#11872) adding integrations-attachments-example.png Bump version to 0.70.0-develop Bump version to 0.69.1 .....
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
3 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.
The code looked for the key
SlackBridge_Botnames, which is not referencedanywhere else. Instead, it now looks for the key
SlackBridge_ExcludeBotnames.