summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-04 08:09:52 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-04 08:09:52 -0500
commit8a3d2a7351afcef6b697bb79acbc36ed183078ce (patch)
tree0ca2839bba377f4fd42ef252cd2e998c4cf4f7e9
parentd9c7fce07744f38715e96f34bf7eaf75d1bcfb00 (diff)
parent83fe1edc7e43b6f741fd62438ef111e291f23dd6 (diff)
downloadchat-8a3d2a7351afcef6b697bb79acbc36ed183078ce.tar.gz
chat-8a3d2a7351afcef6b697bb79acbc36ed183078ce.tar.bz2
chat-8a3d2a7351afcef6b697bb79acbc36ed183078ce.zip
Merge pull request #1286 from hmhealey/plt973
PLT-973 Re-enabled Markdown tables
-rw-r--r--web/react/utils/markdown.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index f9416b2de..3ef09211f 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -208,7 +208,8 @@ export function format(text, options) {
const markdownOptions = {
renderer: new MattermostMarkdownRenderer(null, options),
sanitize: true,
- gfm: true
+ gfm: true,
+ tables: true
};
const tokens = marked.lexer(text, markdownOptions);