Skip to content

Commit

Permalink
Merge branch 'upgrade-markdown' of https://github.com/johnetordoff/os…
Browse files Browse the repository at this point in the history
…f.io into django-3-upgrade

* 'upgrade-markdown' of https://github.com/johnetordoff/osf.io:
  upgrade markdown
  [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965)
  [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966)
  [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958)
  [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974)
  [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961)
  [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950)
  move createcachetable to post migrate signal (CenterForOpenScience#9944)
  remove post-migrate signals from migration stream (CenterForOpenScience#9964)
  • Loading branch information
John Tordoff committed Aug 14, 2022
2 parents bb4e8ba + de9db09 commit f348b4d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
12 changes: 4 additions & 8 deletions addons/wiki/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,12 @@ def build_html_output(content, node):
content,
extensions=[
wikilinks.WikiLinkExtension(
configs=[
('base_url', ''),
('end_url', ''),
('build_url', functools.partial(build_wiki_url, node))
]
base_url='',
end_url='',
build_url=functools.partial(build_wiki_url, node)
),
fenced_code.FencedCodeExtension(),
codehilite.CodeHiliteExtension(
[('css_class', 'highlight')]
)
codehilite.CodeHiliteExtension(css_class='highlight')
]
)

Expand Down
2 changes: 1 addition & 1 deletion website/project/views/comment.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def update_comment_node(root_target_id, source_node, destination_node):


def render_email_markdown(content):
return markdown.markdown(content, ['del_ins', 'markdown.extensions.tables', 'markdown.extensions.fenced_code'])
return markdown.markdown(content, extensions=['mdx_del_ins', 'markdown.extensions.tables', 'markdown.extensions.fenced_code'])


@comment_added.connect
Expand Down

0 comments on commit f348b4d

Please sign in to comment.