Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
98cccda6
Unverified
Commit
98cccda6
authored
Aug 27, 2017
by
Steffen van Bergerem
Committed by
Benjamin Neff
Aug 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove auto detection of languages with highlightjs
Fixes #7476 closes #7591
parent
2bb7d4e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
Changelog.md
Changelog.md
+1
-0
app/assets/javascripts/app/helpers/text_formatter.js
app/assets/javascripts/app/helpers/text_formatter.js
+0
-4
No files found.
Changelog.md
View file @
98cccda6
...
...
@@ -7,6 +7,7 @@
*
Remove tiff support from photos
[
#7576
](
https://github.com/diaspora/diaspora/pull/7576
)
*
Remove reference from reshares when original post is deleted
[
#7578
](
https://github.com/diaspora/diaspora/pull/7578
)
*
Merge migrations from before 0.6.0.0 to CreateSchema
[
#7580
](
https://github.com/diaspora/diaspora/pull/7580
)
*
Remove auto detection of languages with highlightjs
[
#7591
](
https://github.com/diaspora/diaspora/pull/7591
)
## Bug fixes
*
Fix displaying polls with long answers
[
#7579
](
https://github.com/diaspora/diaspora/pull/7579
)
...
...
app/assets/javascripts/app/helpers/text_formatter.js
View file @
98cccda6
...
...
@@ -71,10 +71,6 @@
}
catch
(
__
)
{}
}
try
{
return
hljs
.
highlightAuto
(
str
).
value
;
}
catch
(
__
)
{}
return
""
;
}
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment