Merged
Conversation
sampaiodiego
requested changes
May 17, 2017
Contributor
Author
|
@sampaiodiego ah... Seems it has to actually be compiled. highlightjs/highlight.js#1505 (comment) |
Contributor
Author
|
@sampaiodiego Adjusted to newest release. Can we review / merge. Previous was because I was referencing a commit. Apparently whats released to npm isn't directly from repo 😁 |
sampaiodiego
approved these changes
Jun 1, 2017
Syirrus
pushed a commit
to Syirrus/Rocket.Chat
that referenced
this pull request
Jun 5, 2017
…nto clarapy-v4 * 'develop' of https://github.com/RocketChat/Rocket.Chat: (102 commits) Fix forbidden error on setAvatar REST endpoint (RocketChat#7159) Fix migration version Switch logic of artifact name (RocketChat#7158) fix reactions Remove missing CoffeeScript dependencies Update server.js Update server.js Update server.js [FIX] Fix highlightjs bug (RocketChat#6991) Convert hipchat importer to js Convert file unsubscribe.coffee to js Fix migration if email already exists [NEW] Internal Hubot load scripts from custom folders (RocketChat#7095) Unit: Fix mentions tests Unit: Fix mentions tests Fix tests remove the missing coffee files fix eslint Bump Update oauth2-client.js ... # Conflicts: # packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
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.
@RocketChat/core
Closes #6814
The specific commit i'm referring to: highlightjs/highlight.js@d05317a
There have been commits since... So I don't know if we want those. But we for sure want this one and no release has been made yet