Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Fix highlightjs bug #6991

Merged
merged 2 commits into from Jun 1, 2017
Merged

[FIX] Fix highlightjs bug #6991

merged 2 commits into from Jun 1, 2017

Conversation

geekgonecrazy
Copy link
Member

@geekgonecrazy geekgonecrazy commented May 17, 2017

@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

@geekgonecrazy geekgonecrazy added this to the 0.57.0 milestone May 17, 2017
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6991 May 17, 2017 00:55 Inactive
Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got this error when trying to run it:

image

and then got stuck at
image

@geekgonecrazy
Copy link
Member Author

@sampaiodiego ah... Seems it has to actually be compiled.

highlightjs/highlight.js#1505 (comment)
https://highlightjs.readthedocs.io/en/latest/building-testing.html - Not sure how we pull that off unless we fork and publish to npm :(

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6991 June 1, 2017 02:43 Inactive
@geekgonecrazy
Copy link
Member 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 sampaiodiego merged commit ea8ce48 into develop Jun 1, 2017
@sampaiodiego sampaiodiego deleted the fix/6814 branch June 1, 2017 15:17
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants